New upstream version 0.26.0upstream/0.26.0

15 files changed, 12097 insertions, 18088 deletions

diff --git a/plugins/shotwell-publishing/FacebookPublishing.c b/plugins/shotwell-publishing/FacebookPublishing.c
index de24060..7e06d66 100644
--- a/plugins/shotwell-publishing/FacebookPublishing.c
+++ b/plugins/shotwell-publishing/FacebookPublishing.c
@@ -16,13 +16,12 @@
 #include <gio/gio.h>
 #include "shotwell-plugin-common.h"
 #include <glib/gi18n-lib.h>
+#include "shotwell-authenticator.h"
 #include <json-glib/json-glib.h>
 #include <gtk/gtk.h>
-#include <libsoup/soup.h>
 #include <float.h>
 #include <math.h>
-#include <locale.h>
-#include <webkit2/webkit2.h>
+#include <libsoup/soup.h>
 #include <gobject/gvaluecollector.h>
 
 
@@ -76,16 +75,6 @@ typedef struct _PublishingFacebookPublishingParametersPrivate PublishingFacebook
 typedef struct _PublishingFacebookParamSpecPublishingParameters PublishingFacebookParamSpecPublishingParameters;
 typedef struct _PublishingFacebookFacebookPublisherPrivate PublishingFacebookFacebookPublisherPrivate;
 
-#define PUBLISHING_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE (publishing_facebook_web_authentication_pane_get_type ())
-#define PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE, PublishingFacebookWebAuthenticationPane))
-#define PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE, PublishingFacebookWebAuthenticationPaneClass))
-#define PUBLISHING_FACEBOOK_IS_WEB_AUTHENTICATION_PANE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE))
-#define PUBLISHING_FACEBOOK_IS_WEB_AUTHENTICATION_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE))
-#define PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE, PublishingFacebookWebAuthenticationPaneClass))
-
-typedef struct _PublishingFacebookWebAuthenticationPane PublishingFacebookWebAuthenticationPane;
-typedef struct _PublishingFacebookWebAuthenticationPaneClass PublishingFacebookWebAuthenticationPaneClass;
-
 #define PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION (publishing_facebook_graph_session_get_type ())
 #define PUBLISHING_FACEBOOK_GRAPH_SESSION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION, PublishingFacebookGraphSession))
 #define PUBLISHING_FACEBOOK_GRAPH_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION, PublishingFacebookGraphSessionClass))
@@ -134,21 +123,8 @@ typedef struct _PublishingFacebookGraphMessageClass PublishingFacebookGraphMessa
 #define __vala_JsonNode_free0(var) ((var == NULL) ? NULL : (var = (_vala_JsonNode_free (var), NULL)))
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 #define _json_array_unref0(var) ((var == NULL) ? NULL : (var = (json_array_unref (var), NULL)))
-#define _g_regex_unref0(var) ((var == NULL) ? NULL : (var = (g_regex_unref (var), NULL)))
-typedef struct _PublishingFacebookWebAuthenticationPanePrivate PublishingFacebookWebAuthenticationPanePrivate;
-
-#define PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP (publishing_facebook_web_authentication_pane_locale_lookup_get_type ())
-#define PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_LOCALE_LOOKUP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP, PublishingFacebookWebAuthenticationPaneLocaleLookup))
-#define PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_LOCALE_LOOKUP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP, PublishingFacebookWebAuthenticationPaneLocaleLookupClass))
-#define PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_IS_LOCALE_LOOKUP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP))
-#define PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_IS_LOCALE_LOOKUP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP))
-#define PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_LOCALE_LOOKUP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP, PublishingFacebookWebAuthenticationPaneLocaleLookupClass))
-
-typedef struct _PublishingFacebookWebAuthenticationPaneLocaleLookup PublishingFacebookWebAuthenticationPaneLocaleLookup;
-typedef struct _PublishingFacebookWebAuthenticationPaneLocaleLookupClass PublishingFacebookWebAuthenticationPaneLocaleLookupClass;
-typedef struct _PublishingFacebookWebAuthenticationPaneLocaleLookupPrivate PublishingFacebookWebAuthenticationPaneLocaleLookupPrivate;
-#define _publishing_facebook_web_authentication_pane_locale_lookup_unref0(var) ((var == NULL) ? NULL : (var = (publishing_facebook_web_authentication_pane_locale_lookup_unref (var), NULL)))
-typedef struct _PublishingFacebookWebAuthenticationPaneParamSpecLocaleLookup PublishingFacebookWebAuthenticationPaneParamSpecLocaleLookup;
+#define _g_variant_unref0(var) ((var == NULL) ? NULL : (var = (g_variant_unref (var), NULL)))
+#define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL)))
 typedef struct _PublishingFacebookPublishingOptionsPanePrivate PublishingFacebookPublishingOptionsPanePrivate;
 
 #define PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION (publishing_facebook_publishing_options_pane_privacy_description_get_type ())
@@ -181,16 +157,6 @@ typedef struct _PublishingFacebookGraphSessionGraphMessageImpl PublishingFaceboo
 typedef struct _PublishingFacebookGraphSessionGraphMessageImplClass PublishingFacebookGraphSessionGraphMessageImplClass;
 typedef struct _PublishingFacebookGraphSessionGraphMessageImplPrivate PublishingFacebookGraphSessionGraphMessageImplPrivate;
 
-#define PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_ENDPOINT_PROBE_MESSAGE (publishing_facebook_graph_session_graph_endpoint_probe_message_get_type ())
-#define PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_ENDPOINT_PROBE_MESSAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_ENDPOINT_PROBE_MESSAGE, PublishingFacebookGraphSessionGraphEndpointProbeMessage))
-#define PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_ENDPOINT_PROBE_MESSAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_ENDPOINT_PROBE_MESSAGE, PublishingFacebookGraphSessionGraphEndpointProbeMessageClass))
-#define PUBLISHING_FACEBOOK_GRAPH_SESSION_IS_GRAPH_ENDPOINT_PROBE_MESSAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_ENDPOINT_PROBE_MESSAGE))
-#define PUBLISHING_FACEBOOK_GRAPH_SESSION_IS_GRAPH_ENDPOINT_PROBE_MESSAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_ENDPOINT_PROBE_MESSAGE))
-#define PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_ENDPOINT_PROBE_MESSAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_ENDPOINT_PROBE_MESSAGE, PublishingFacebookGraphSessionGraphEndpointProbeMessageClass))
-
-typedef struct _PublishingFacebookGraphSessionGraphEndpointProbeMessage PublishingFacebookGraphSessionGraphEndpointProbeMessage;
-typedef struct _PublishingFacebookGraphSessionGraphEndpointProbeMessageClass PublishingFacebookGraphSessionGraphEndpointProbeMessageClass;
-
 #define PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_QUERY_MESSAGE (publishing_facebook_graph_session_graph_query_message_get_type ())
 #define PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_QUERY_MESSAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_QUERY_MESSAGE, PublishingFacebookGraphSessionGraphQueryMessage))
 #define PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_QUERY_MESSAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_QUERY_MESSAGE, PublishingFacebookGraphSessionGraphQueryMessageClass))
@@ -220,8 +186,19 @@ typedef struct _PublishingFacebookGraphSessionGraphUploadMessageClass Publishing
 
 typedef struct _PublishingFacebookGraphSessionGraphCreateAlbumMessage PublishingFacebookGraphSessionGraphCreateAlbumMessage;
 typedef struct _PublishingFacebookGraphSessionGraphCreateAlbumMessageClass PublishingFacebookGraphSessionGraphCreateAlbumMessageClass;
+#define _g_regex_unref0(var) ((var == NULL) ? NULL : (var = (g_regex_unref (var), NULL)))
 typedef struct _PublishingFacebookGraphSessionGraphQueryMessagePrivate PublishingFacebookGraphSessionGraphQueryMessagePrivate;
 #define __vala_SoupURI_free0(var) ((var == NULL) ? NULL : (var = (_vala_SoupURI_free (var), NULL)))
+
+#define PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_ENDPOINT_PROBE_MESSAGE (publishing_facebook_graph_session_graph_endpoint_probe_message_get_type ())
+#define PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_ENDPOINT_PROBE_MESSAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_ENDPOINT_PROBE_MESSAGE, PublishingFacebookGraphSessionGraphEndpointProbeMessage))
+#define PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_ENDPOINT_PROBE_MESSAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_ENDPOINT_PROBE_MESSAGE, PublishingFacebookGraphSessionGraphEndpointProbeMessageClass))
+#define PUBLISHING_FACEBOOK_GRAPH_SESSION_IS_GRAPH_ENDPOINT_PROBE_MESSAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_ENDPOINT_PROBE_MESSAGE))
+#define PUBLISHING_FACEBOOK_GRAPH_SESSION_IS_GRAPH_ENDPOINT_PROBE_MESSAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_ENDPOINT_PROBE_MESSAGE))
+#define PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_ENDPOINT_PROBE_MESSAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_ENDPOINT_PROBE_MESSAGE, PublishingFacebookGraphSessionGraphEndpointProbeMessageClass))
+
+typedef struct _PublishingFacebookGraphSessionGraphEndpointProbeMessage PublishingFacebookGraphSessionGraphEndpointProbeMessage;
+typedef struct _PublishingFacebookGraphSessionGraphEndpointProbeMessageClass PublishingFacebookGraphSessionGraphEndpointProbeMessageClass;
 typedef struct _PublishingFacebookGraphSessionGraphEndpointProbeMessagePrivate PublishingFacebookGraphSessionGraphEndpointProbeMessagePrivate;
 typedef struct _PublishingFacebookGraphSessionGraphUploadMessagePrivate PublishingFacebookGraphSessionGraphUploadMessagePrivate;
 #define _g_mapped_file_unref0(var) ((var == NULL) ? NULL : (var = (g_mapped_file_unref (var), NULL)))
@@ -303,11 +280,11 @@ struct _PublishingFacebookFacebookPublisherClass {
 struct _PublishingFacebookFacebookPublisherPrivate {
 	PublishingFacebookPublishingParameters* publishing_params;
 	SpitPublishingPluginHost* host;
-	PublishingFacebookWebAuthenticationPane* web_auth_pane;
 	SpitPublishingProgressCallback progress_reporter;
 	gpointer progress_reporter_target;
 	GDestroyNotify progress_reporter_target_destroy_notify;
 	SpitPublishingService* service;
+	SpitPublishingAuthenticator* authenticator;
 	gboolean running;
 	PublishingFacebookGraphSession* graph_session;
 	PublishingFacebookPublishingOptionsPane* publishing_options_pane;
@@ -316,36 +293,6 @@ struct _PublishingFacebookFacebookPublisherPrivate {
 	gchar* username;
 };
 
-struct _PublishingFacebookWebAuthenticationPane {
-	ShotwellPluginsCommonWebAuthenticationPane parent_instance;
-	PublishingFacebookWebAuthenticationPanePrivate * priv;
-};
-
-struct _PublishingFacebookWebAuthenticationPaneClass {
-	ShotwellPluginsCommonWebAuthenticationPaneClass parent_class;
-};
-
-struct _PublishingFacebookWebAuthenticationPaneLocaleLookup {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	PublishingFacebookWebAuthenticationPaneLocaleLookupPrivate * priv;
-	gchar* prefix;
-	gchar* translation;
-	gchar* exception_code;
-	gchar* exception_translation;
-	gchar* exception_code_2;
-	gchar* exception_translation_2;
-};
-
-struct _PublishingFacebookWebAuthenticationPaneLocaleLookupClass {
-	GTypeClass parent_class;
-	void (*finalize) (PublishingFacebookWebAuthenticationPaneLocaleLookup *self);
-};
-
-struct _PublishingFacebookWebAuthenticationPaneParamSpecLocaleLookup {
-	GParamSpec parent_instance;
-};
-
 struct _PublishingFacebookPublishingOptionsPane {
 	GObject parent_instance;
 	PublishingFacebookPublishingOptionsPanePrivate * priv;
@@ -538,15 +485,6 @@ static gpointer publishing_facebook_album_parent_class = NULL;
 static gpointer publishing_facebook_publishing_parameters_parent_class = NULL;
 static gpointer publishing_facebook_facebook_publisher_parent_class = NULL;
 static SpitPublishingPublisherIface* publishing_facebook_facebook_publisher_spit_publishing_publisher_parent_iface = NULL;
-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 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;
@@ -580,19 +518,7 @@ static SpitPublishingPublisherMediaType facebook_service_real_get_supported_medi
 static void facebook_service_finalize (GObject* obj);
 #define PUBLISHING_FACEBOOK_SERVICE_NAME "facebook"
 #define PUBLISHING_FACEBOOK_USER_VISIBLE_NAME "Facebook"
-#define PUBLISHING_FACEBOOK_APPLICATION_ID "1612018629063184"
 #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" \
-"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.")
-#define PUBLISHING_FACEBOOK_RESTART_ERROR_MESSAGE _ ("You have already logged in and out of Facebook during this Shotwell se" \
-"ssion.\n" \
-"To continue publishing to Facebook, quit and restart Shotwell, then tr" \
-"y publishing again.")
-#define PUBLISHING_FACEBOOK_USER_AGENT "Java/1.6.0_16"
 #define PUBLISHING_FACEBOOK_EXPIRED_SESSION_STATUS_CODE 400
 gpointer publishing_facebook_album_ref (gpointer instance);
 void publishing_facebook_album_unref (gpointer instance);
@@ -630,7 +556,6 @@ void publishing_facebook_publishing_parameters_set_target_album_by_name (Publish
 gchar* publishing_facebook_publishing_parameters_get_target_album_name (PublishingFacebookPublishingParameters* self);
 gchar* publishing_facebook_publishing_parameters_get_target_album_id (PublishingFacebookPublishingParameters* self);
 static void publishing_facebook_publishing_parameters_finalize (PublishingFacebookPublishingParameters* obj);
-GType publishing_facebook_web_authentication_pane_get_type (void) G_GNUC_CONST;
 gpointer publishing_facebook_graph_session_ref (gpointer instance);
 void publishing_facebook_graph_session_unref (gpointer instance);
 GParamSpec* publishing_facebook_param_spec_graph_session (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -654,18 +579,11 @@ PublishingFacebookGraphSession* publishing_facebook_graph_session_new (void);
 PublishingFacebookGraphSession* publishing_facebook_graph_session_construct (GType object_type);
 static void publishing_facebook_facebook_publisher_on_session_authenticated (PublishingFacebookFacebookPublisher* self);
 static void _publishing_facebook_facebook_publisher_on_session_authenticated_publishing_facebook_graph_session_authenticated (PublishingFacebookGraphSession* _sender, gpointer self);
-static gboolean publishing_facebook_facebook_publisher_is_persistent_session_valid (PublishingFacebookFacebookPublisher* self);
-static gchar* publishing_facebook_facebook_publisher_get_persistent_access_token (PublishingFacebookFacebookPublisher* self);
 static gboolean publishing_facebook_facebook_publisher_get_persistent_strip_metadata (PublishingFacebookFacebookPublisher* self);
-static void publishing_facebook_facebook_publisher_set_persistent_access_token (PublishingFacebookFacebookPublisher* self, const gchar* access_token);
 static void publishing_facebook_facebook_publisher_set_persistent_strip_metadata (PublishingFacebookFacebookPublisher* self, gboolean strip_metadata);
 gint publishing_facebook_facebook_publisher_get_persistent_default_size (PublishingFacebookFacebookPublisher* self);
 void publishing_facebook_facebook_publisher_set_persistent_default_size (PublishingFacebookFacebookPublisher* self, gint size);
-static void publishing_facebook_facebook_publisher_invalidate_persistent_session (PublishingFacebookFacebookPublisher* self);
-static void publishing_facebook_facebook_publisher_do_show_service_welcome_pane (PublishingFacebookFacebookPublisher* self);
-static void publishing_facebook_facebook_publisher_on_login_clicked (PublishingFacebookFacebookPublisher* self);
-static void _publishing_facebook_facebook_publisher_on_login_clicked_spit_publishing_login_callback (gpointer self);
-static void publishing_facebook_facebook_publisher_do_test_connection_to_endpoint (PublishingFacebookFacebookPublisher* self);
+static void publishing_facebook_facebook_publisher_do_fetch_user_info (PublishingFacebookFacebookPublisher* self);
 gpointer publishing_facebook_graph_message_ref (gpointer instance);
 void publishing_facebook_graph_message_unref (gpointer instance);
 GParamSpec* publishing_facebook_param_spec_graph_message (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -673,18 +591,12 @@ void publishing_facebook_value_set_graph_message (GValue* value, gpointer v_obje
 void publishing_facebook_value_take_graph_message (GValue* value, gpointer v_object);
 gpointer publishing_facebook_value_get_graph_message (const GValue* value);
 GType publishing_facebook_graph_message_get_type (void) G_GNUC_CONST;
-PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_endpoint_test (PublishingFacebookGraphSession* self);
-static void publishing_facebook_facebook_publisher_on_endpoint_test_completed (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message);
-static void _publishing_facebook_facebook_publisher_on_endpoint_test_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender, gpointer self);
-static void publishing_facebook_facebook_publisher_on_endpoint_test_error (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message, GError* _error_);
-static void _publishing_facebook_facebook_publisher_on_endpoint_test_error_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender, GError* err, gpointer self);
-void publishing_facebook_graph_session_send_message (PublishingFacebookGraphSession* self, PublishingFacebookGraphMessage* message);
-static void publishing_facebook_facebook_publisher_do_fetch_user_info (PublishingFacebookFacebookPublisher* self);
 PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_query (PublishingFacebookGraphSession* self, const gchar* resource_path);
 static void publishing_facebook_facebook_publisher_on_fetch_user_info_completed (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message);
 static void _publishing_facebook_facebook_publisher_on_fetch_user_info_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender, gpointer self);
 static void publishing_facebook_facebook_publisher_on_fetch_user_info_error (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message, GError* _error_);
 static void _publishing_facebook_facebook_publisher_on_fetch_user_info_error_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender, GError* err, gpointer self);
+void publishing_facebook_graph_session_send_message (PublishingFacebookGraphSession* self, PublishingFacebookGraphMessage* message);
 static void publishing_facebook_facebook_publisher_do_fetch_album_descriptions (PublishingFacebookFacebookPublisher* self);
 static void publishing_facebook_facebook_publisher_on_fetch_albums_completed (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message);
 static void _publishing_facebook_facebook_publisher_on_fetch_albums_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender, gpointer self);
@@ -703,8 +615,8 @@ static void _publishing_facebook_facebook_publisher_on_create_album_completed_pu
 static void publishing_facebook_facebook_publisher_on_create_album_error (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message, GError* err);
 static void _publishing_facebook_facebook_publisher_on_create_album_error_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender, GError* err, gpointer self);
 static void publishing_facebook_facebook_publisher_do_show_publishing_options_pane (PublishingFacebookFacebookPublisher* self);
-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);
-PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_pane_construct (GType object_type, const gchar* username, PublishingFacebookAlbum** albums, int albums_length1, SpitPublishingPublisherMediaType media_type, PublishingFacebookFacebookPublisher* publisher, GtkBuilder* builder, gboolean strip_metadata);
+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, gboolean can_logout);
+PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_pane_construct (GType object_type, const gchar* username, PublishingFacebookAlbum** albums, int albums_length1, SpitPublishingPublisherMediaType media_type, PublishingFacebookFacebookPublisher* publisher, GtkBuilder* builder, gboolean strip_metadata, gboolean can_logout);
 static void publishing_facebook_facebook_publisher_on_publishing_options_pane_logout (PublishingFacebookFacebookPublisher* self);
 static void _publishing_facebook_facebook_publisher_on_publishing_options_pane_logout_publishing_facebook_publishing_options_pane_logout (PublishingFacebookPublishingOptionsPane* _sender, gpointer self);
 static void publishing_facebook_facebook_publisher_on_publishing_options_pane_publish (PublishingFacebookFacebookPublisher* self, const gchar* target_album, const gchar* privacy_setting, PublishingFacebookResolution resolution, gboolean strip_metadata);
@@ -712,17 +624,10 @@ static void _publishing_facebook_facebook_publisher_on_publishing_options_pane_p
 static void publishing_facebook_facebook_publisher_do_logout (PublishingFacebookFacebookPublisher* self);
 static void publishing_facebook_facebook_publisher_do_add_new_local_album_from_json (PublishingFacebookFacebookPublisher* self, const gchar* album_name, const gchar* json);
 static void publishing_facebook_facebook_publisher_do_upload (PublishingFacebookFacebookPublisher* self);
-static void publishing_facebook_facebook_publisher_do_hosted_web_authentication (PublishingFacebookFacebookPublisher* self);
-PublishingFacebookWebAuthenticationPane* publishing_facebook_web_authentication_pane_new (void);
-PublishingFacebookWebAuthenticationPane* publishing_facebook_web_authentication_pane_construct (GType object_type);
-static void publishing_facebook_facebook_publisher_on_web_auth_pane_login_succeeded (PublishingFacebookFacebookPublisher* self, const gchar* success_url);
-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);
-static void publishing_facebook_facebook_publisher_on_web_auth_pane_login_failed (PublishingFacebookFacebookPublisher* self);
-static void _publishing_facebook_facebook_publisher_on_web_auth_pane_login_failed_publishing_facebook_web_authentication_pane_login_failed (PublishingFacebookWebAuthenticationPane* _sender, gpointer self);
-static void publishing_facebook_facebook_publisher_do_authenticate_session (PublishingFacebookFacebookPublisher* self, const gchar* good_login_uri);
+static void publishing_facebook_facebook_publisher_on_authenticator_succeeded (PublishingFacebookFacebookPublisher* self);
+static void publishing_facebook_facebook_publisher_do_authenticate_session (PublishingFacebookFacebookPublisher* self);
+static void publishing_facebook_facebook_publisher_on_authenticator_failed (PublishingFacebookFacebookPublisher* self);
 void publishing_facebook_graph_session_authenticate (PublishingFacebookGraphSession* self, const gchar* access_token);
-static void publishing_facebook_facebook_publisher_do_save_session_information (PublishingFacebookFacebookPublisher* self);
-gchar* publishing_facebook_graph_session_get_access_token (PublishingFacebookGraphSession* self);
 PublishingFacebookUploader* publishing_facebook_uploader_new (PublishingFacebookGraphSession* session, PublishingFacebookPublishingParameters* publishing_params, SpitPublishingPublishable** publishables, int publishables_length1);
 PublishingFacebookUploader* publishing_facebook_uploader_construct (GType object_type, PublishingFacebookGraphSession* session, PublishingFacebookPublishingParameters* publishing_params, SpitPublishingPublishable** publishables, int publishables_length1);
 static void publishing_facebook_facebook_publisher_on_upload_complete (PublishingFacebookFacebookPublisher* self, PublishingFacebookUploader* uploader, gint num_published);
@@ -740,31 +645,12 @@ static SpitPublishingService* publishing_facebook_facebook_publisher_real_get_se
 gchar* publishing_facebook_facebook_publisher_get_service_name (PublishingFacebookFacebookPublisher* self);
 gchar* publishing_facebook_facebook_publisher_get_user_visible_name (PublishingFacebookFacebookPublisher* self);
 static void publishing_facebook_facebook_publisher_real_start (SpitPublishingPublisher* base);
-gboolean publishing_facebook_web_authentication_pane_is_cache_dirty (void);
+static void _publishing_facebook_facebook_publisher_on_authenticator_succeeded_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender, gpointer self);
+static void _publishing_facebook_facebook_publisher_on_authenticator_failed_spit_publishing_authenticator_authentication_failed (SpitPublishingAuthenticator* _sender, gpointer self);
 static void publishing_facebook_facebook_publisher_real_stop (SpitPublishingPublisher* base);
 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;
-static void publishing_facebook_web_authentication_pane_value_set_locale_lookup (GValue* value, gpointer v_object) G_GNUC_UNUSED;
-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;
-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 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
-};
-static void publishing_facebook_web_authentication_pane_locale_lookup_finalize (PublishingFacebookWebAuthenticationPaneLocaleLookup* obj);
-static void publishing_facebook_web_authentication_pane_finalize (GObject* obj);
 static gpointer publishing_facebook_publishing_options_pane_privacy_description_ref (gpointer instance);
 static void publishing_facebook_publishing_options_pane_privacy_description_unref (gpointer instance);
 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) G_GNUC_UNUSED;
@@ -841,9 +727,6 @@ static void publishing_facebook_graph_session_unmanage_message (PublishingFacebo
 static GType publishing_facebook_graph_session_graph_message_impl_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 static void publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data (PublishingFacebookGraphSessionGraphMessageImpl* self, SoupBuffer* chunk);
 static void _publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data_soup_message_wrote_body_data (SoupMessage* _sender, SoupBuffer* chunk, gpointer self);
-static PublishingFacebookGraphSessionGraphEndpointProbeMessage* publishing_facebook_graph_session_graph_endpoint_probe_message_new (PublishingFacebookGraphSession* host_session);
-static PublishingFacebookGraphSessionGraphEndpointProbeMessage* publishing_facebook_graph_session_graph_endpoint_probe_message_construct (GType object_type, PublishingFacebookGraphSession* host_session);
-static GType publishing_facebook_graph_session_graph_endpoint_probe_message_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 static PublishingFacebookGraphSessionGraphQueryMessage* publishing_facebook_graph_session_graph_query_message_new (PublishingFacebookGraphSession* host_session, const gchar* relative_uri, const gchar* access_token);
 static PublishingFacebookGraphSessionGraphQueryMessage* publishing_facebook_graph_session_graph_query_message_construct (GType object_type, PublishingFacebookGraphSession* host_session, const gchar* relative_uri, const gchar* access_token);
 static GType publishing_facebook_graph_session_graph_query_message_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
@@ -867,9 +750,12 @@ enum  {
 	PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_QUERY_MESSAGE_DUMMY_PROPERTY
 };
 static void _vala_SoupURI_free (SoupURI* self);
+static GType publishing_facebook_graph_session_graph_endpoint_probe_message_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 enum  {
 	PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_ENDPOINT_PROBE_MESSAGE_DUMMY_PROPERTY
 };
+static PublishingFacebookGraphSessionGraphEndpointProbeMessage* publishing_facebook_graph_session_graph_endpoint_probe_message_new (PublishingFacebookGraphSession* host_session);
+static PublishingFacebookGraphSessionGraphEndpointProbeMessage* publishing_facebook_graph_session_graph_endpoint_probe_message_construct (GType object_type, PublishingFacebookGraphSession* host_session);
 #define PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_UPLOAD_MESSAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_UPLOAD_MESSAGE, PublishingFacebookGraphSessionGraphUploadMessagePrivate))
 enum  {
 	PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_UPLOAD_MESSAGE_DUMMY_PROPERTY
@@ -898,7 +784,6 @@ static void publishing_facebook_uploader_send_files (PublishingFacebookUploader*
 static void publishing_facebook_uploader_finalize (PublishingFacebookUploader* obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
-static gint _vala_array_length (gpointer array);
 
 
 FacebookService* facebook_service_construct (GType object_type, GFile* resource_directory) {
@@ -915,7 +800,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 911 "FacebookPublishing.c"
+#line 804 "FacebookPublishing.c"
 		gint _tmp1_ = 0;
 		GdkPixbuf** _tmp2_ = NULL;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -928,18 +813,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 924 "FacebookPublishing.c"
+#line 817 "FacebookPublishing.c"
 	}
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 928 "FacebookPublishing.c"
+#line 821 "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 935 "FacebookPublishing.c"
+#line 828 "FacebookPublishing.c"
 }
 
 
@@ -961,7 +846,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 957 "FacebookPublishing.c"
+#line 850 "FacebookPublishing.c"
 }
 
 
@@ -974,7 +859,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 970 "FacebookPublishing.c"
+#line 863 "FacebookPublishing.c"
 }
 
 
@@ -987,14 +872,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 983 "FacebookPublishing.c"
+#line 876 "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 990 "FacebookPublishing.c"
+#line 883 "FacebookPublishing.c"
 }
 
 
@@ -1005,17 +890,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 1001 "FacebookPublishing.c"
+#line 894 "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 1007 "FacebookPublishing.c"
+#line 900 "FacebookPublishing.c"
 	}
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 1011 "FacebookPublishing.c"
+#line 904 "FacebookPublishing.c"
 }
 
 
@@ -1097,7 +982,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 1093 "FacebookPublishing.c"
+#line 986 "FacebookPublishing.c"
 }
 
 
@@ -1105,7 +990,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 1101 "FacebookPublishing.c"
+#line 994 "FacebookPublishing.c"
 }
 
 
@@ -1126,7 +1011,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 1122 "FacebookPublishing.c"
+#line 1015 "FacebookPublishing.c"
 }
 
 
@@ -1139,7 +1024,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 1135 "FacebookPublishing.c"
+#line 1028 "FacebookPublishing.c"
 }
 
 
@@ -1148,7 +1033,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 1144 "FacebookPublishing.c"
+#line 1037 "FacebookPublishing.c"
 }
 
 
@@ -1165,7 +1050,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 1161 "FacebookPublishing.c"
+#line 1054 "FacebookPublishing.c"
 }
 
 
@@ -1176,7 +1061,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 1172 "FacebookPublishing.c"
+#line 1065 "FacebookPublishing.c"
 }
 
 
@@ -1190,7 +1075,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 1186 "FacebookPublishing.c"
+#line 1079 "FacebookPublishing.c"
 }
 
 
@@ -1216,248 +1101,248 @@ PublishingFacebookAlbum* publishing_facebook_album_construct (GType object_type,
 	gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (id != NULL, NULL);
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = (PublishingFacebookAlbum*) g_type_create_instance (object_type);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = name;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->name);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->name = _tmp1_;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = id;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->id);
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->id = _tmp3_;
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 1236 "FacebookPublishing.c"
+#line 1129 "FacebookPublishing.c"
 }
 
 
 PublishingFacebookAlbum* publishing_facebook_album_new (const gchar* name, const gchar* id) {
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_album_construct (PUBLISHING_FACEBOOK_TYPE_ALBUM, name, id);
-#line 1243 "FacebookPublishing.c"
+#line 1136 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_value_album_init (GValue* value) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 1250 "FacebookPublishing.c"
+#line 1143 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_value_album_free_value (GValue* value) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/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"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_album_unref (value->data[0].v_pointer);
-#line 1259 "FacebookPublishing.c"
+#line 1152 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_value_album_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/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 1269 "FacebookPublishing.c"
+#line 1162 "FacebookPublishing.c"
 	} else {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1273 "FacebookPublishing.c"
+#line 1166 "FacebookPublishing.c"
 	}
 }
 
 
 static gpointer publishing_facebook_value_album_peek_pointer (const GValue* value) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1281 "FacebookPublishing.c"
+#line 1174 "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"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 1288 "FacebookPublishing.c"
+#line 1181 "FacebookPublishing.c"
 		PublishingFacebookAlbum* object;
 		object = collect_values[0].v_pointer;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/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"
+#line 64 "/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 1295 "FacebookPublishing.c"
+#line 1188 "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"
+#line 64 "/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 1299 "FacebookPublishing.c"
+#line 1192 "FacebookPublishing.c"
 		}
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = publishing_facebook_album_ref (object);
-#line 1303 "FacebookPublishing.c"
+#line 1196 "FacebookPublishing.c"
 	} else {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1307 "FacebookPublishing.c"
+#line 1200 "FacebookPublishing.c"
 	}
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 1311 "FacebookPublishing.c"
+#line 1204 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_value_album_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingFacebookAlbum** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!object_p) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/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 1322 "FacebookPublishing.c"
+#line 1215 "FacebookPublishing.c"
 	}
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/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"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = NULL;
-#line 1328 "FacebookPublishing.c"
+#line 1221 "FacebookPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1332 "FacebookPublishing.c"
+#line 1225 "FacebookPublishing.c"
 	} else {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = publishing_facebook_album_ref (value->data[0].v_pointer);
-#line 1336 "FacebookPublishing.c"
+#line 1229 "FacebookPublishing.c"
 	}
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 1340 "FacebookPublishing.c"
+#line 1233 "FacebookPublishing.c"
 }
 
 
 GParamSpec* publishing_facebook_param_spec_album (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingFacebookParamSpecAlbum* spec;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_FACEBOOK_TYPE_ALBUM), NULL);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 1354 "FacebookPublishing.c"
+#line 1247 "FacebookPublishing.c"
 }
 
 
 gpointer publishing_facebook_value_get_album (const GValue* value) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	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"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1363 "FacebookPublishing.c"
+#line 1256 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_value_set_album (GValue* value, gpointer v_object) {
 	PublishingFacebookAlbum* old;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_ALBUM));
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (v_object) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FACEBOOK_TYPE_ALBUM));
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/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 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_album_ref (value->data[0].v_pointer);
-#line 1383 "FacebookPublishing.c"
+#line 1276 "FacebookPublishing.c"
 	} else {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1387 "FacebookPublishing.c"
+#line 1280 "FacebookPublishing.c"
 	}
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_album_unref (old);
-#line 1393 "FacebookPublishing.c"
+#line 1286 "FacebookPublishing.c"
 	}
 }
 
 
 void publishing_facebook_value_take_album (GValue* value, gpointer v_object) {
 	PublishingFacebookAlbum* old;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_ALBUM));
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (v_object) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FACEBOOK_TYPE_ALBUM));
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/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 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1412 "FacebookPublishing.c"
+#line 1305 "FacebookPublishing.c"
 	} else {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1416 "FacebookPublishing.c"
+#line 1309 "FacebookPublishing.c"
 	}
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_album_unref (old);
-#line 1422 "FacebookPublishing.c"
+#line 1315 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_album_class_init (PublishingFacebookAlbumClass * klass) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_album_parent_class = g_type_class_peek_parent (klass);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookAlbumClass *) klass)->finalize = publishing_facebook_album_finalize;
-#line 1432 "FacebookPublishing.c"
+#line 1325 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_album_instance_init (PublishingFacebookAlbum * self) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->ref_count = 1;
-#line 1439 "FacebookPublishing.c"
+#line 1332 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_album_finalize (PublishingFacebookAlbum* obj) {
 	PublishingFacebookAlbum * self;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_ALBUM, PublishingFacebookAlbum);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 65 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->name);
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->id);
-#line 1453 "FacebookPublishing.c"
+#line 1346 "FacebookPublishing.c"
 }
 
 
@@ -1478,72 +1363,72 @@ GType publishing_facebook_album_get_type (void) {
 gpointer publishing_facebook_album_ref (gpointer instance) {
 	PublishingFacebookAlbum* self;
 	self = instance;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return instance;
-#line 1478 "FacebookPublishing.c"
+#line 1371 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_album_unref (gpointer instance) {
 	PublishingFacebookAlbum* self;
 	self = instance;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		PUBLISHING_FACEBOOK_ALBUM_GET_CLASS (self)->finalize (self);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1491 "FacebookPublishing.c"
+#line 1384 "FacebookPublishing.c"
 	}
 }
 
 
 gchar* publishing_facebook_resolution_get_name (PublishingFacebookResolution self) {
 	gchar* result = NULL;
-#line 85 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	switch (self) {
-#line 85 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case PUBLISHING_FACEBOOK_RESOLUTION_STANDARD:
-#line 1502 "FacebookPublishing.c"
+#line 1395 "FacebookPublishing.c"
 		{
 			const gchar* _tmp0_ = NULL;
 			gchar* _tmp1_ = NULL;
-#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp0_ = _ ("Standard (720 pixels)");
-#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp1_ = g_strdup (_tmp0_);
-#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			result = _tmp1_;
-#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return result;
-#line 1514 "FacebookPublishing.c"
+#line 1407 "FacebookPublishing.c"
 		}
-#line 85 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case PUBLISHING_FACEBOOK_RESOLUTION_HIGH:
-#line 1518 "FacebookPublishing.c"
+#line 1411 "FacebookPublishing.c"
 		{
 			const gchar* _tmp2_ = NULL;
 			gchar* _tmp3_ = NULL;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp2_ = _ ("Large (2048 pixels)");
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp3_ = g_strdup (_tmp2_);
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			result = _tmp3_;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return result;
-#line 1530 "FacebookPublishing.c"
+#line 1423 "FacebookPublishing.c"
 		}
 		default:
 		{
 			GEnumValue* _tmp4_;
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_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 1539 "FacebookPublishing.c"
+#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+			g_error ("FacebookPublishing.vala:87: Unknown resolution %s", (_tmp4_ != NULL) ? _tmp4_->value_name : NULL);
+#line 1432 "FacebookPublishing.c"
 		}
 	}
 }
@@ -1551,36 +1436,36 @@ gchar* publishing_facebook_resolution_get_name (PublishingFacebookResolution sel
 
 gint publishing_facebook_resolution_get_pixels (PublishingFacebookResolution self) {
 	gint result = 0;
-#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	switch (self) {
-#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case PUBLISHING_FACEBOOK_RESOLUTION_STANDARD:
-#line 1551 "FacebookPublishing.c"
+#line 1444 "FacebookPublishing.c"
 		{
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			result = 720;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return result;
-#line 1557 "FacebookPublishing.c"
+#line 1450 "FacebookPublishing.c"
 		}
-#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case PUBLISHING_FACEBOOK_RESOLUTION_HIGH:
-#line 1561 "FacebookPublishing.c"
+#line 1454 "FacebookPublishing.c"
 		{
-#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			result = 2048;
-#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return result;
-#line 1567 "FacebookPublishing.c"
+#line 1460 "FacebookPublishing.c"
 		}
 		default:
 		{
 			GEnumValue* _tmp0_;
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_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 1576 "FacebookPublishing.c"
+#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+			g_error ("FacebookPublishing.vala:100: Unknown resolution %s", (_tmp0_ != NULL) ? _tmp0_->value_name : NULL);
+#line 1469 "FacebookPublishing.c"
 		}
 	}
 }
@@ -1600,64 +1485,64 @@ GType publishing_facebook_resolution_get_type (void) {
 
 PublishingFacebookPublishingParameters* publishing_facebook_publishing_parameters_construct (GType object_type) {
 	PublishingFacebookPublishingParameters* self = NULL;
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = (PublishingFacebookPublishingParameters*) g_type_create_instance (object_type);
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->albums = (_vala_array_free (self->albums, self->albums_length1, (GDestroyNotify) publishing_facebook_album_unref), NULL);
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->albums = NULL;
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->albums_length1 = 0;
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->_albums_size_ = self->albums_length1;
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->privacy_object);
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->privacy_object = NULL;
-#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->target_album = PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM;
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->new_album_name);
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->new_album_name = NULL;
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->strip_metadata = FALSE;
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->resolution = PUBLISHING_FACEBOOK_RESOLUTION_HIGH;
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	self->resolution = PUBLISHING_FACEBOOK_RESOLUTION_HIGH;
+#line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 1622 "FacebookPublishing.c"
+#line 1515 "FacebookPublishing.c"
 }
 
 
 PublishingFacebookPublishingParameters* publishing_facebook_publishing_parameters_new (void) {
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_publishing_parameters_construct (PUBLISHING_FACEBOOK_TYPE_PUBLISHING_PARAMETERS);
-#line 1629 "FacebookPublishing.c"
+#line 1522 "FacebookPublishing.c"
 }
 
 
 static gpointer _publishing_facebook_album_ref0 (gpointer self) {
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? publishing_facebook_album_ref (self) : NULL;
-#line 1636 "FacebookPublishing.c"
+#line 1529 "FacebookPublishing.c"
 }
 
 
 static void _vala_array_add6 (PublishingFacebookAlbum*** array, int* length, int* size, PublishingFacebookAlbum* value) {
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if ((*length) == (*size)) {
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*array = g_renew (PublishingFacebookAlbum*, *array, (*size) + 1);
-#line 1647 "FacebookPublishing.c"
+#line 1540 "FacebookPublishing.c"
 	}
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[*length] = NULL;
-#line 1653 "FacebookPublishing.c"
+#line 1546 "FacebookPublishing.c"
 }
 
 
@@ -1671,80 +1556,80 @@ void publishing_facebook_publishing_parameters_add_album (PublishingFacebookPubl
 	PublishingFacebookAlbum** _tmp5_ = NULL;
 	gint _tmp5__length1 = 0;
 	PublishingFacebookAlbum* _tmp6_ = NULL;
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_PARAMETERS (self));
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (name != NULL);
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (id != NULL);
-#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->albums;
-#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0__length1 = self->albums_length1;
-#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 1679 "FacebookPublishing.c"
+#line 1572 "FacebookPublishing.c"
 		PublishingFacebookAlbum** _tmp1_ = NULL;
-#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp1_ = g_new0 (PublishingFacebookAlbum*, 0 + 1);
-#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		self->albums = (_vala_array_free (self->albums, self->albums_length1, (GDestroyNotify) publishing_facebook_album_unref), NULL);
-#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		self->albums = _tmp1_;
-#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		self->albums_length1 = 0;
-#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		self->_albums_size_ = self->albums_length1;
-#line 1691 "FacebookPublishing.c"
+#line 1584 "FacebookPublishing.c"
 	}
-#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = name;
-#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = id;
-#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = publishing_facebook_album_new (_tmp2_, _tmp3_);
-#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	new_album = _tmp4_;
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = self->albums;
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5__length1 = self->albums_length1;
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = _publishing_facebook_album_ref0 (new_album);
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_array_add6 (&self->albums, &self->albums_length1, &self->_albums_size_, _tmp6_);
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_album_unref0 (new_album);
-#line 1711 "FacebookPublishing.c"
+#line 1604 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_publishing_parameters_set_target_album_by_name (PublishingFacebookPublishingParameters* self, const gchar* name) {
 	const gchar* _tmp0_ = NULL;
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_PARAMETERS (self));
-#line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = name;
-#line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		self->target_album = PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM;
-#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 1727 "FacebookPublishing.c"
+#line 1620 "FacebookPublishing.c"
 	}
 	{
 		gint i = 0;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		i = 0;
-#line 1733 "FacebookPublishing.c"
+#line 1626 "FacebookPublishing.c"
 		{
 			gboolean _tmp1_ = FALSE;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp1_ = TRUE;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			while (TRUE) {
-#line 1740 "FacebookPublishing.c"
+#line 1633 "FacebookPublishing.c"
 				gint _tmp3_ = 0;
 				PublishingFacebookAlbum** _tmp4_ = NULL;
 				gint _tmp4__length1 = 0;
@@ -1754,60 +1639,60 @@ void publishing_facebook_publishing_parameters_set_target_album_by_name (Publish
 				PublishingFacebookAlbum* _tmp7_ = NULL;
 				const gchar* _tmp8_ = NULL;
 				const gchar* _tmp9_ = NULL;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				if (!_tmp1_) {
-#line 1752 "FacebookPublishing.c"
+#line 1645 "FacebookPublishing.c"
 					gint _tmp2_ = 0;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp2_ = i;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					i = _tmp2_ + 1;
-#line 1758 "FacebookPublishing.c"
+#line 1651 "FacebookPublishing.c"
 				}
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp1_ = FALSE;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp3_ = i;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp4_ = self->albums;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp4__length1 = self->albums_length1;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				if (!(_tmp3_ < _tmp4__length1)) {
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					break;
-#line 1772 "FacebookPublishing.c"
+#line 1665 "FacebookPublishing.c"
 				}
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp5_ = self->albums;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp5__length1 = self->albums_length1;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp6_ = i;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp7_ = _tmp5_[_tmp6_];
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp8_ = _tmp7_->name;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp9_ = name;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				if (g_strcmp0 (_tmp8_, _tmp9_) == 0) {
-#line 1788 "FacebookPublishing.c"
+#line 1681 "FacebookPublishing.c"
 					gint _tmp10_ = 0;
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp10_ = i;
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					self->target_album = _tmp10_;
-#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					return;
-#line 1796 "FacebookPublishing.c"
+#line 1689 "FacebookPublishing.c"
 				}
 			}
 		}
 	}
-#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->target_album = PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM;
-#line 1803 "FacebookPublishing.c"
+#line 1696 "FacebookPublishing.c"
 }
 
 
@@ -1822,50 +1707,50 @@ gchar* publishing_facebook_publishing_parameters_get_target_album_name (Publishi
 	PublishingFacebookAlbum* _tmp5_ = NULL;
 	const gchar* _tmp6_ = NULL;
 	gchar* _tmp7_ = NULL;
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_PARAMETERS (self), NULL);
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->albums;
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1__length1 = self->albums_length1;
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp1_ == NULL) {
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = TRUE;
-#line 1828 "FacebookPublishing.c"
+#line 1721 "FacebookPublishing.c"
 	} else {
 		gint _tmp2_ = 0;
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp2_ = self->target_album;
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = _tmp2_ == PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM;
-#line 1835 "FacebookPublishing.c"
+#line 1728 "FacebookPublishing.c"
 	}
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp0_) {
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		result = NULL;
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return result;
-#line 1843 "FacebookPublishing.c"
+#line 1736 "FacebookPublishing.c"
 	}
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = self->albums;
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3__length1 = self->albums_length1;
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = self->target_album;
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = _tmp3_[_tmp4_];
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = _tmp5_->name;
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = g_strdup (_tmp6_);
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp7_;
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 1861 "FacebookPublishing.c"
+#line 1754 "FacebookPublishing.c"
 }
 
 
@@ -1880,262 +1765,262 @@ gchar* publishing_facebook_publishing_parameters_get_target_album_id (Publishing
 	PublishingFacebookAlbum* _tmp5_ = NULL;
 	const gchar* _tmp6_ = NULL;
 	gchar* _tmp7_ = NULL;
-#line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_PARAMETERS (self), NULL);
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->albums;
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1__length1 = self->albums_length1;
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp1_ == NULL) {
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = TRUE;
-#line 1886 "FacebookPublishing.c"
+#line 1779 "FacebookPublishing.c"
 	} else {
 		gint _tmp2_ = 0;
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp2_ = self->target_album;
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = _tmp2_ == PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM;
-#line 1893 "FacebookPublishing.c"
+#line 1786 "FacebookPublishing.c"
 	}
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp0_) {
-#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		result = NULL;
-#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return result;
-#line 1901 "FacebookPublishing.c"
+#line 1794 "FacebookPublishing.c"
 	}
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = self->albums;
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3__length1 = self->albums_length1;
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = self->target_album;
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = _tmp3_[_tmp4_];
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = _tmp5_->id;
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = g_strdup (_tmp6_);
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp7_;
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 1919 "FacebookPublishing.c"
+#line 1812 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_value_publishing_parameters_init (GValue* value) {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 1926 "FacebookPublishing.c"
+#line 1819 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_value_publishing_parameters_free_value (GValue* value) {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/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"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_parameters_unref (value->data[0].v_pointer);
-#line 1935 "FacebookPublishing.c"
+#line 1828 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_value_publishing_parameters_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/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 1945 "FacebookPublishing.c"
+#line 1838 "FacebookPublishing.c"
 	} else {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1949 "FacebookPublishing.c"
+#line 1842 "FacebookPublishing.c"
 	}
 }
 
 
 static gpointer publishing_facebook_value_publishing_parameters_peek_pointer (const GValue* value) {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1957 "FacebookPublishing.c"
+#line 1850 "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"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 1964 "FacebookPublishing.c"
+#line 1857 "FacebookPublishing.c"
 		PublishingFacebookPublishingParameters* object;
 		object = collect_values[0].v_pointer;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/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"
+#line 105 "/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 1971 "FacebookPublishing.c"
+#line 1864 "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"
+#line 105 "/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 1975 "FacebookPublishing.c"
+#line 1868 "FacebookPublishing.c"
 		}
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = publishing_facebook_publishing_parameters_ref (object);
-#line 1979 "FacebookPublishing.c"
+#line 1872 "FacebookPublishing.c"
 	} else {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1983 "FacebookPublishing.c"
+#line 1876 "FacebookPublishing.c"
 	}
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 1987 "FacebookPublishing.c"
+#line 1880 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_value_publishing_parameters_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingFacebookPublishingParameters** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!object_p) {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/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 1998 "FacebookPublishing.c"
+#line 1891 "FacebookPublishing.c"
 	}
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/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"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = NULL;
-#line 2004 "FacebookPublishing.c"
+#line 1897 "FacebookPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2008 "FacebookPublishing.c"
+#line 1901 "FacebookPublishing.c"
 	} else {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = publishing_facebook_publishing_parameters_ref (value->data[0].v_pointer);
-#line 2012 "FacebookPublishing.c"
+#line 1905 "FacebookPublishing.c"
 	}
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 2016 "FacebookPublishing.c"
+#line 1909 "FacebookPublishing.c"
 }
 
 
 GParamSpec* publishing_facebook_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingFacebookParamSpecPublishingParameters* spec;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_PARAMETERS), NULL);
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 2030 "FacebookPublishing.c"
+#line 1923 "FacebookPublishing.c"
 }
 
 
 gpointer publishing_facebook_value_get_publishing_parameters (const GValue* value) {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	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"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 2039 "FacebookPublishing.c"
+#line 1932 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_value_set_publishing_parameters (GValue* value, gpointer v_object) {
 	PublishingFacebookPublishingParameters* old;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_PARAMETERS));
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (v_object) {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_PARAMETERS));
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/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 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_parameters_ref (value->data[0].v_pointer);
-#line 2059 "FacebookPublishing.c"
+#line 1952 "FacebookPublishing.c"
 	} else {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 2063 "FacebookPublishing.c"
+#line 1956 "FacebookPublishing.c"
 	}
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_parameters_unref (old);
-#line 2069 "FacebookPublishing.c"
+#line 1962 "FacebookPublishing.c"
 	}
 }
 
 
 void publishing_facebook_value_take_publishing_parameters (GValue* value, gpointer v_object) {
 	PublishingFacebookPublishingParameters* old;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_PARAMETERS));
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (v_object) {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_PARAMETERS));
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/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 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 2088 "FacebookPublishing.c"
+#line 1981 "FacebookPublishing.c"
 	} else {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 2092 "FacebookPublishing.c"
+#line 1985 "FacebookPublishing.c"
 	}
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_parameters_unref (old);
-#line 2098 "FacebookPublishing.c"
+#line 1991 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_publishing_parameters_class_init (PublishingFacebookPublishingParametersClass * klass) {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_parameters_parent_class = g_type_class_peek_parent (klass);
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookPublishingParametersClass *) klass)->finalize = publishing_facebook_publishing_parameters_finalize;
-#line 2108 "FacebookPublishing.c"
+#line 2001 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_parameters_instance_init (PublishingFacebookPublishingParameters * self) {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->ref_count = 1;
-#line 2115 "FacebookPublishing.c"
+#line 2008 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_parameters_finalize (PublishingFacebookPublishingParameters* obj) {
 	PublishingFacebookPublishingParameters * self;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_PARAMETERS, PublishingFacebookPublishingParameters);
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->albums = (_vala_array_free (self->albums, self->albums_length1, (GDestroyNotify) publishing_facebook_album_unref), NULL);
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->new_album_name);
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->privacy_object);
-#line 2131 "FacebookPublishing.c"
+#line 2024 "FacebookPublishing.c"
 }
 
 
@@ -2156,32 +2041,32 @@ GType publishing_facebook_publishing_parameters_get_type (void) {
 gpointer publishing_facebook_publishing_parameters_ref (gpointer instance) {
 	PublishingFacebookPublishingParameters* self;
 	self = instance;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return instance;
-#line 2156 "FacebookPublishing.c"
+#line 2049 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_publishing_parameters_unref (gpointer instance) {
 	PublishingFacebookPublishingParameters* self;
 	self = instance;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self);
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2169 "FacebookPublishing.c"
+#line 2062 "FacebookPublishing.c"
 	}
 }
 
 
 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"
+#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_session_authenticated ((PublishingFacebookFacebookPublisher*) self);
-#line 2177 "FacebookPublishing.c"
+#line 2070 "FacebookPublishing.c"
 }
 
 
@@ -2190,109 +2075,68 @@ PublishingFacebookFacebookPublisher* publishing_facebook_facebook_publisher_cons
 	SpitPublishingService* _tmp0_ = NULL;
 	SpitPublishingPluginHost* _tmp1_ = NULL;
 	PublishingFacebookPublishingParameters* _tmp2_ = NULL;
-	PublishingFacebookGraphSession* _tmp3_ = NULL;
-	PublishingFacebookGraphSession* _tmp4_ = NULL;
-#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	PublishingAuthenticatorFactory* _tmp3_ = NULL;
+	PublishingAuthenticatorFactory* _tmp4_ = NULL;
+	SpitPublishingPluginHost* _tmp5_ = NULL;
+	SpitPublishingAuthenticator* _tmp6_ = NULL;
+	PublishingFacebookGraphSession* _tmp7_ = NULL;
+	PublishingFacebookGraphSession* _tmp8_ = NULL;
+#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
-#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
-#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = (PublishingFacebookFacebookPublisher*) g_object_new (object_type, NULL);
-#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:189: FacebookPublisher instantiated.");
-#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:183: FacebookPublisher instantiated.");
+#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = service;
-#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->service = _tmp0_;
-#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = host;
-#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->host = _tmp1_;
-#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = publishing_facebook_publishing_parameters_new ();
-#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_publishing_parameters_unref0 (self->priv->publishing_params);
-#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->publishing_params = _tmp2_;
-#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp3_ = publishing_facebook_graph_session_new ();
-#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp3_ = publishing_authenticator_factory_get_instance ();
+#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp4_ = _tmp3_;
+#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp5_ = host;
+#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp6_ = spit_publishing_authenticator_factory_create (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY, SpitPublishingAuthenticatorFactory), "facebook", _tmp5_);
+#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_g_object_unref0 (self->priv->authenticator);
+#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	self->priv->authenticator = _tmp6_;
+#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_g_object_unref0 (_tmp4_);
+#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp7_ = publishing_facebook_graph_session_new ();
+#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_session_unref0 (self->priv->graph_session);
-#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->graph_session = _tmp3_;
-#line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp4_ = self->priv->graph_session;
-#line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	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"
+#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	self->priv->graph_session = _tmp7_;
+#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp8_ = self->priv->graph_session;
+#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_signal_connect_object (_tmp8_, "authenticated", (GCallback) _publishing_facebook_facebook_publisher_on_session_authenticated_publishing_facebook_graph_session_authenticated, self, 0);
+#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 2222 "FacebookPublishing.c"
+#line 2133 "FacebookPublishing.c"
 }
 
 
 PublishingFacebookFacebookPublisher* publishing_facebook_facebook_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
-#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_facebook_publisher_construct (PUBLISHING_FACEBOOK_TYPE_FACEBOOK_PUBLISHER, service, host);
-#line 2229 "FacebookPublishing.c"
-}
-
-
-static gboolean publishing_facebook_facebook_publisher_is_persistent_session_valid (PublishingFacebookFacebookPublisher* self) {
-	gboolean result = FALSE;
-	gchar* token = NULL;
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp3_ = NULL;
-#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self), FALSE);
-#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = publishing_facebook_facebook_publisher_get_persistent_access_token (self);
-#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	token = _tmp0_;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = token;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp1_ != NULL) {
-#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 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 2259 "FacebookPublishing.c"
-	}
-#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp3_ = token;
-#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	result = _tmp3_ != NULL;
-#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (token);
-#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	return result;
-#line 2269 "FacebookPublishing.c"
-}
-
-
-static gchar* publishing_facebook_facebook_publisher_get_persistent_access_token (PublishingFacebookFacebookPublisher* self) {
-	gchar* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self), NULL);
-#line 213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_token", NULL);
-#line 213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	result = _tmp1_;
-#line 213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	return result;
-#line 2287 "FacebookPublishing.c"
+#line 2140 "FacebookPublishing.c"
 }
 
 
@@ -2300,49 +2144,32 @@ static gboolean publishing_facebook_facebook_publisher_get_persistent_strip_meta
 	gboolean result = FALSE;
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self), FALSE);
-#line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", FALSE);
-#line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp1_;
-#line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 2305 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_facebook_publisher_set_persistent_access_token (PublishingFacebookFacebookPublisher* self, const gchar* access_token) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_if_fail (access_token != NULL);
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_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 2322 "FacebookPublishing.c"
+#line 2158 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_set_persistent_strip_metadata (PublishingFacebookFacebookPublisher* self, gboolean strip_metadata) {
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = strip_metadata;
-#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 202 "/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 2337 "FacebookPublishing.c"
+#line 2173 "FacebookPublishing.c"
 }
 
 
@@ -2350,140 +2177,46 @@ gint publishing_facebook_facebook_publisher_get_persistent_default_size (Publish
 	gint result = 0;
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self), 0);
-#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_size", 0);
-#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp1_;
-#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 2355 "FacebookPublishing.c"
+#line 2191 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_facebook_publisher_set_persistent_default_size (PublishingFacebookFacebookPublisher* self, gint size) {
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = size;
-#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 212 "/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 2370 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_facebook_publisher_invalidate_persistent_session (PublishingFacebookFacebookPublisher* self) {
-#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	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 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 2388 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_facebook_publisher_do_show_service_welcome_pane (PublishingFacebookFacebookPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:245: ACTION: showing service welcome pane.");
-#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	spit_publishing_plugin_host_install_welcome_pane (_tmp0_, PUBLISHING_FACEBOOK_SERVICE_WELCOME_MESSAGE, _publishing_facebook_facebook_publisher_on_login_clicked_spit_publishing_login_callback, self);
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_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 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 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 2421 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_facebook_publisher_do_test_connection_to_endpoint (PublishingFacebookFacebookPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PublishingFacebookGraphMessage* endpoint_test_message = NULL;
-	PublishingFacebookGraphSession* _tmp3_ = NULL;
-	PublishingFacebookGraphMessage* _tmp4_ = NULL;
-	PublishingFacebookGraphSession* _tmp5_ = NULL;
-#line 251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:252: ACTION: testing connection to Facebook en" \
-"dpoint.");
-#line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
-#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…");
-#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"
-	_tmp3_ = self->priv->graph_session;
-#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp4_ = publishing_facebook_graph_session_new_endpoint_test (_tmp3_);
-#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	endpoint_test_message = _tmp4_;
-#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_connect_object (endpoint_test_message, "completed", (GCallback) _publishing_facebook_facebook_publisher_on_endpoint_test_completed_publishing_facebook_graph_message_completed, self, 0);
-#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_connect_object (endpoint_test_message, "failed", (GCallback) _publishing_facebook_facebook_publisher_on_endpoint_test_error_publishing_facebook_graph_message_failed, self, 0);
-#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = self->priv->graph_session;
-#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	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 2463 "FacebookPublishing.c"
+#line 2206 "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"
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_fetch_user_info_completed ((PublishingFacebookFacebookPublisher*) self, _sender);
-#line 2470 "FacebookPublishing.c"
+#line 2213 "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"
+#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_fetch_user_info_error ((PublishingFacebookFacebookPublisher*) self, _sender, err);
-#line 2477 "FacebookPublishing.c"
+#line 2220 "FacebookPublishing.c"
 }
 
 
@@ -2494,49 +2227,49 @@ static void publishing_facebook_facebook_publisher_do_fetch_user_info (Publishin
 	PublishingFacebookGraphSession* _tmp2_ = NULL;
 	PublishingFacebookGraphMessage* _tmp3_ = NULL;
 	PublishingFacebookGraphSession* _tmp4_ = NULL;
-#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:265: ACTION: fetching user information.");
-#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:231: ACTION: fetching user information.");
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
-#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->host;
-#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spit_publishing_plugin_host_install_account_fetch_wait_pane (_tmp1_);
-#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = self->priv->graph_session;
-#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = publishing_facebook_graph_session_new_query (_tmp2_, "/me");
-#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	user_info_message = _tmp3_;
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect_object (user_info_message, "completed", (GCallback) _publishing_facebook_facebook_publisher_on_fetch_user_info_completed_publishing_facebook_graph_message_completed, self, 0);
-#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect_object (user_info_message, "failed", (GCallback) _publishing_facebook_facebook_publisher_on_fetch_user_info_error_publishing_facebook_graph_message_failed, self, 0);
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = self->priv->graph_session;
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_session_send_message (_tmp4_, user_info_message);
-#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (user_info_message);
-#line 2516 "FacebookPublishing.c"
+#line 2259 "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"
+#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_fetch_albums_completed ((PublishingFacebookFacebookPublisher*) self, _sender);
-#line 2523 "FacebookPublishing.c"
+#line 2266 "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"
+#line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_fetch_albums_error ((PublishingFacebookFacebookPublisher*) self, _sender, err);
-#line 2530 "FacebookPublishing.c"
+#line 2273 "FacebookPublishing.c"
 }
 
 
@@ -2551,86 +2284,86 @@ static void publishing_facebook_facebook_publisher_do_fetch_album_descriptions (
 	PublishingFacebookGraphMessage* _tmp6_ = NULL;
 	PublishingFacebookGraphMessage* _tmp7_ = NULL;
 	PublishingFacebookGraphSession* _tmp8_ = NULL;
-#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:279: ACTION: fetching album list.");
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:245: ACTION: fetching album list.");
+#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
-#line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->host;
-#line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spit_publishing_plugin_host_install_account_fetch_wait_pane (_tmp1_);
-#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = self->priv->graph_session;
-#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = self->priv->uid;
-#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = g_strdup_printf ("/%s/albums", _tmp3_);
-#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = _tmp4_;
-#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = publishing_facebook_graph_session_new_query (_tmp2_, _tmp5_);
-#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = _tmp6_;
-#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp5_);
-#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	albums_message = _tmp7_;
-#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect_object (albums_message, "completed", (GCallback) _publishing_facebook_facebook_publisher_on_fetch_albums_completed_publishing_facebook_graph_message_completed, self, 0);
-#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect_object (albums_message, "failed", (GCallback) _publishing_facebook_facebook_publisher_on_fetch_albums_error_publishing_facebook_graph_message_failed, self, 0);
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = self->priv->graph_session;
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_session_send_message (_tmp8_, albums_message);
-#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (albums_message);
-#line 2583 "FacebookPublishing.c"
+#line 2326 "FacebookPublishing.c"
 }
 
 
 static JsonNode* _vala_JsonNode_copy (JsonNode* self) {
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return g_boxed_copy (json_node_get_type (), self);
-#line 2590 "FacebookPublishing.c"
+#line 2333 "FacebookPublishing.c"
 }
 
 
 static gpointer __vala_JsonNode_copy0 (gpointer self) {
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? _vala_JsonNode_copy (self) : NULL;
-#line 2597 "FacebookPublishing.c"
+#line 2340 "FacebookPublishing.c"
 }
 
 
 static gpointer _json_object_ref0 (gpointer self) {
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? json_object_ref (self) : NULL;
-#line 2604 "FacebookPublishing.c"
+#line 2347 "FacebookPublishing.c"
 }
 
 
 static void _vala_JsonNode_free (JsonNode* self) {
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_boxed_free (json_node_get_type (), self);
-#line 2611 "FacebookPublishing.c"
+#line 2354 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_do_extract_user_info_from_json (PublishingFacebookFacebookPublisher* self, const gchar* json) {
 	GError * _inner_error_ = NULL;
-#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (json != NULL);
-#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:293: ACTION: extracting user info from JSON re" \
+#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:259: ACTION: extracting user info from JSON re" \
 "sponse.");
-#line 2623 "FacebookPublishing.c"
+#line 2366 "FacebookPublishing.c"
 	{
 		JsonParser* parser = NULL;
 		JsonParser* _tmp0_ = NULL;
@@ -2650,66 +2383,66 @@ static void publishing_facebook_facebook_publisher_do_extract_user_info_from_jso
 		JsonObject* _tmp12_ = NULL;
 		const gchar* _tmp13_ = NULL;
 		gchar* _tmp14_ = NULL;
-#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = json_parser_new ();
-#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		parser = _tmp0_;
-#line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp1_ = parser;
-#line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp2_ = json;
-#line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		json_parser_load_from_data (_tmp1_, _tmp2_, (gssize) -1, &_inner_error_);
-#line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_object_unref0 (parser);
-#line 2657 "FacebookPublishing.c"
+#line 2400 "FacebookPublishing.c"
 			goto __catch0_g_error;
 		}
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp3_ = parser;
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp4_ = json_parser_get_root (_tmp3_);
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp5_ = __vala_JsonNode_copy0 (_tmp4_);
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		root = _tmp5_;
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp6_ = root;
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp7_ = json_node_get_object (_tmp6_);
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp8_ = _json_object_ref0 (_tmp7_);
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		response_object = _tmp8_;
-#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp9_ = response_object;
-#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp10_ = json_object_get_string_member (_tmp9_, "id");
-#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp11_ = g_strdup (_tmp10_);
-#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (self->priv->uid);
-#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		self->priv->uid = _tmp11_;
-#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp12_ = response_object;
-#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp13_ = json_object_get_string_member (_tmp12_, "name");
-#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp14_ = g_strdup (_tmp13_);
-#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (self->priv->username);
-#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		self->priv->username = _tmp14_;
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_json_object_unref0 (response_object);
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		__vala_JsonNode_free0 (root);
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_object_unref0 (parser);
-#line 2702 "FacebookPublishing.c"
+#line 2445 "FacebookPublishing.c"
 	}
 	goto __finally0;
 	__catch0_g_error:
@@ -2720,64 +2453,64 @@ static void publishing_facebook_facebook_publisher_do_extract_user_info_from_jso
 		const gchar* _tmp17_ = NULL;
 		GError* _tmp18_ = NULL;
 		GError* _tmp19_ = NULL;
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_error_ = _inner_error_;
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_inner_error_ = NULL;
-#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp15_ = self->priv->host;
-#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp16_ = _error_;
-#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp17_ = _tmp16_->message;
-#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp18_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp17_);
-#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp19_ = _tmp18_;
-#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp15_, _tmp19_);
-#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_error_free0 (_tmp19_);
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_error_free0 (_error_);
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 2735 "FacebookPublishing.c"
+#line 2478 "FacebookPublishing.c"
 	}
 	__finally0:
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 261 "/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 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 2746 "FacebookPublishing.c"
+#line 2489 "FacebookPublishing.c"
 	}
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_user_info_extracted (self);
-#line 2750 "FacebookPublishing.c"
+#line 2493 "FacebookPublishing.c"
 }
 
 
 static gpointer _json_array_ref0 (gpointer self) {
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? json_array_ref (self) : NULL;
-#line 2757 "FacebookPublishing.c"
+#line 2500 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_do_extract_albums_from_json (PublishingFacebookFacebookPublisher* self, const gchar* json) {
 	GError * _inner_error_ = NULL;
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (json != NULL);
-#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:312: ACTION: extracting album info from JSON r" \
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:278: ACTION: extracting album info from JSON r" \
 "esponse.");
-#line 2769 "FacebookPublishing.c"
+#line 2512 "FacebookPublishing.c"
 	{
 		JsonParser* parser = NULL;
 		JsonParser* _tmp0_ = NULL;
@@ -2797,72 +2530,72 @@ static void publishing_facebook_facebook_publisher_do_extract_albums_from_json (
 		JsonArray* _tmp11_ = NULL;
 		PublishingFacebookPublishingParameters* _tmp12_ = NULL;
 		PublishingFacebookAlbum** _tmp13_ = NULL;
-#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = json_parser_new ();
-#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		parser = _tmp0_;
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp1_ = parser;
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp2_ = json;
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		json_parser_load_from_data (_tmp1_, _tmp2_, (gssize) -1, &_inner_error_);
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_object_unref0 (parser);
-#line 2803 "FacebookPublishing.c"
+#line 2546 "FacebookPublishing.c"
 			goto __catch1_g_error;
 		}
-#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp3_ = parser;
-#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp4_ = json_parser_get_root (_tmp3_);
-#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp5_ = __vala_JsonNode_copy0 (_tmp4_);
-#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		root = _tmp5_;
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp6_ = root;
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp7_ = json_node_get_object (_tmp6_);
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp8_ = _json_object_ref0 (_tmp7_);
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		response_object = _tmp8_;
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp9_ = response_object;
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp10_ = json_object_get_array_member (_tmp9_, "data");
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp11_ = _json_array_ref0 (_tmp10_);
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		album_list = _tmp11_;
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp12_ = self->priv->publishing_params;
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp13_ = g_new0 (PublishingFacebookAlbum*, 0 + 1);
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp12_->albums = (_vala_array_free (_tmp12_->albums, _tmp12_->albums_length1, (GDestroyNotify) publishing_facebook_album_unref), NULL);
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp12_->albums = _tmp13_;
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp12_->albums_length1 = 0;
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp12_->_albums_size_ = _tmp12_->albums_length1;
-#line 2842 "FacebookPublishing.c"
+#line 2585 "FacebookPublishing.c"
 		{
 			gint i = 0;
-#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			i = 0;
-#line 2847 "FacebookPublishing.c"
+#line 2590 "FacebookPublishing.c"
 			{
 				gboolean _tmp14_ = FALSE;
-#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp14_ = TRUE;
-#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				while (TRUE) {
-#line 2854 "FacebookPublishing.c"
+#line 2597 "FacebookPublishing.c"
 					gint _tmp16_ = 0;
 					JsonArray* _tmp17_ = NULL;
 					guint _tmp18_ = 0U;
@@ -2882,83 +2615,83 @@ static void publishing_facebook_facebook_publisher_do_extract_albums_from_json (
 					PublishingFacebookPublishingParameters* _tmp29_ = NULL;
 					const gchar* _tmp30_ = NULL;
 					const gchar* _tmp31_ = NULL;
-#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					if (!_tmp14_) {
-#line 2876 "FacebookPublishing.c"
+#line 2619 "FacebookPublishing.c"
 						gint _tmp15_ = 0;
-#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						_tmp15_ = i;
-#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						i = _tmp15_ + 1;
-#line 2882 "FacebookPublishing.c"
+#line 2625 "FacebookPublishing.c"
 					}
-#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp14_ = FALSE;
-#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp16_ = i;
-#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp17_ = album_list;
-#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp18_ = json_array_get_length (_tmp17_);
-#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					if (!(((guint) _tmp16_) < _tmp18_)) {
-#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						break;
-#line 2896 "FacebookPublishing.c"
+#line 2639 "FacebookPublishing.c"
 					}
-#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp19_ = album_list;
-#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp20_ = i;
-#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp21_ = json_array_get_object_element (_tmp19_, (guint) _tmp20_);
-#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp22_ = _json_object_ref0 (_tmp21_);
-#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					current_album = _tmp22_;
-#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp23_ = current_album;
-#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp24_ = json_object_get_string_member (_tmp23_, "id");
-#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp25_ = g_strdup (_tmp24_);
-#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					album_id = _tmp25_;
-#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp26_ = current_album;
-#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp27_ = json_object_get_string_member (_tmp26_, "name");
-#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp28_ = g_strdup (_tmp27_);
-#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					album_name = _tmp28_;
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp29_ = self->priv->publishing_params;
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp30_ = album_name;
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp31_ = album_id;
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					publishing_facebook_publishing_parameters_add_album (_tmp29_, _tmp30_, _tmp31_);
-#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_g_free0 (album_name);
-#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_g_free0 (album_id);
-#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_json_object_unref0 (current_album);
-#line 2938 "FacebookPublishing.c"
+#line 2681 "FacebookPublishing.c"
 				}
 			}
 		}
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_json_array_unref0 (album_list);
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_json_object_unref0 (response_object);
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		__vala_JsonNode_free0 (root);
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_object_unref0 (parser);
-#line 2950 "FacebookPublishing.c"
+#line 2693 "FacebookPublishing.c"
 	}
 	goto __finally1;
 	__catch1_g_error:
@@ -2969,58 +2702,58 @@ static void publishing_facebook_facebook_publisher_do_extract_albums_from_json (
 		const gchar* _tmp34_ = NULL;
 		GError* _tmp35_ = NULL;
 		GError* _tmp36_ = NULL;
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_error_ = _inner_error_;
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_inner_error_ = NULL;
-#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp32_ = self->priv->host;
-#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp33_ = _error_;
-#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp34_ = _tmp33_->message;
-#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp35_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp34_);
-#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp36_ = _tmp35_;
-#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp32_, _tmp36_);
-#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_error_free0 (_tmp36_);
-#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_error_free0 (_error_);
-#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 2983 "FacebookPublishing.c"
+#line 2726 "FacebookPublishing.c"
 	}
 	__finally1:
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 280 "/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 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 2994 "FacebookPublishing.c"
+#line 2737 "FacebookPublishing.c"
 	}
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_albums_extracted (self);
-#line 2998 "FacebookPublishing.c"
+#line 2741 "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"
+#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_create_album_completed ((PublishingFacebookFacebookPublisher*) self, _sender);
-#line 3005 "FacebookPublishing.c"
+#line 2748 "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"
+#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_create_album_error ((PublishingFacebookFacebookPublisher*) self, _sender, err);
-#line 3012 "FacebookPublishing.c"
+#line 2755 "FacebookPublishing.c"
 }
 
 
@@ -3038,64 +2771,64 @@ static void publishing_facebook_facebook_publisher_do_create_new_album (Publishi
 	const gchar* _tmp9_ = NULL;
 	PublishingFacebookGraphMessage* _tmp10_ = NULL;
 	PublishingFacebookGraphSession* _tmp11_ = NULL;
-#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->publishing_params;
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = _tmp0_->new_album_name;
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:345: ACTION: creating a new album named \"%s\"" \
+#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:311: ACTION: creating a new album named \"%s\"" \
 ".\n", _tmp1_);
-#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = self->priv->host;
-#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp2_, TRUE);
-#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = self->priv->host;
-#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = _ ("Creating album…");
-#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 314 "/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"
+#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = self->priv->graph_session;
-#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = self->priv->publishing_params;
-#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = _tmp6_->new_album_name;
-#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = self->priv->publishing_params;
-#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp9_ = _tmp8_->privacy_object;
-#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = publishing_facebook_graph_session_new_create_album (_tmp5_, _tmp7_, _tmp9_);
-#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	create_album_message = _tmp10_;
-#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect_object (create_album_message, "completed", (GCallback) _publishing_facebook_facebook_publisher_on_create_album_completed_publishing_facebook_graph_message_completed, self, 0);
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect_object (create_album_message, "failed", (GCallback) _publishing_facebook_facebook_publisher_on_create_album_error_publishing_facebook_graph_message_failed, self, 0);
-#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp11_ = self->priv->graph_session;
-#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_session_send_message (_tmp11_, create_album_message);
-#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (create_album_message);
-#line 3072 "FacebookPublishing.c"
+#line 2815 "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"
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_publishing_options_pane_logout ((PublishingFacebookFacebookPublisher*) self);
-#line 3079 "FacebookPublishing.c"
+#line 2822 "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"
+#line 348 "/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 3086 "FacebookPublishing.c"
+#line 2829 "FacebookPublishing.c"
 }
 
 
@@ -3111,34 +2844,36 @@ static void publishing_facebook_facebook_publisher_do_show_publishing_options_pa
 	SpitPublishingPublisherMediaType _tmp13_ = 0;
 	GtkBuilder* _tmp14_ = NULL;
 	gboolean _tmp15_ = FALSE;
-	PublishingFacebookPublishingOptionsPane* _tmp16_ = NULL;
-	PublishingFacebookPublishingOptionsPane* _tmp17_ = NULL;
+	SpitPublishingAuthenticator* _tmp16_ = NULL;
+	gboolean _tmp17_ = FALSE;
 	PublishingFacebookPublishingOptionsPane* _tmp18_ = NULL;
-	SpitPublishingPluginHost* _tmp19_ = NULL;
+	PublishingFacebookPublishingOptionsPane* _tmp19_ = NULL;
 	PublishingFacebookPublishingOptionsPane* _tmp20_ = NULL;
+	SpitPublishingPluginHost* _tmp21_ = NULL;
+	PublishingFacebookPublishingOptionsPane* _tmp22_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:360: ACTION: showing publishing options pane.");
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:326: ACTION: showing publishing options pane.");
+#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
-#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = gtk_builder_new ();
-#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	builder = _tmp1_;
-#line 3120 "FacebookPublishing.c"
+#line 2865 "FacebookPublishing.c"
 	{
 		GtkBuilder* _tmp2_ = NULL;
-#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp2_ = builder;
-#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		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"
+#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3129 "FacebookPublishing.c"
+#line 2874 "FacebookPublishing.c"
 			goto __catch2_g_error;
 		}
 	}
@@ -3152,105 +2887,112 @@ static void publishing_facebook_facebook_publisher_do_show_publishing_options_pa
 		const gchar* _tmp6_ = NULL;
 		GError* _tmp7_ = NULL;
 		GError* _tmp8_ = NULL;
-#line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		e = _inner_error_;
-#line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_inner_error_ = NULL;
-#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp3_ = e;
-#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp4_ = _tmp3_->message;
-#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		g_warning ("FacebookPublishing.vala:371: Could not parse UI file! Error: %s.", _tmp4_);
-#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		g_warning ("FacebookPublishing.vala:337: Could not parse UI file! Error: %s.", _tmp4_);
+#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp5_ = self->priv->host;
-#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp6_ = _ ("A file required for publishing is unavailable. Publishing to Facebook " \
 "can’t continue.");
-#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 338 "/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"
+#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp8_ = _tmp7_;
-#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp5_, _tmp8_);
-#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_error_free0 (_tmp8_);
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_error_free0 (e);
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_object_unref0 (builder);
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3171 "FacebookPublishing.c"
+#line 2916 "FacebookPublishing.c"
 	}
 	__finally2:
-#line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_object_unref0 (builder);
-#line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 331 "/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 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3184 "FacebookPublishing.c"
+#line 2929 "FacebookPublishing.c"
 	}
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp9_ = self->priv->username;
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = self->priv->publishing_params;
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp11_ = _tmp10_->albums;
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp11__length1 = _tmp10_->albums_length1;
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp12_ = self->priv->host;
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp13_ = spit_publishing_plugin_host_get_publishable_media_type (_tmp12_);
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp14_ = builder;
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp15_ = publishing_facebook_facebook_publisher_get_persistent_strip_metadata (self);
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp16_ = publishing_facebook_publishing_options_pane_new (_tmp9_, _tmp11_, _tmp11__length1, _tmp13_, self, _tmp14_, _tmp15_);
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp16_ = self->priv->authenticator;
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp17_ = spit_publishing_authenticator_can_logout (_tmp16_);
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp18_ = publishing_facebook_publishing_options_pane_new (_tmp9_, _tmp11_, _tmp11__length1, _tmp13_, self, _tmp14_, _tmp15_, _tmp17_);
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->publishing_options_pane);
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->publishing_options_pane = _tmp16_;
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp17_ = self->priv->publishing_options_pane;
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_connect_object (_tmp17_, "logout", (GCallback) _publishing_facebook_facebook_publisher_on_publishing_options_pane_logout_publishing_facebook_publishing_options_pane_logout, self, 0);
-#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp18_ = self->priv->publishing_options_pane;
-#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_connect_object (_tmp18_, "publish", (GCallback) _publishing_facebook_facebook_publisher_on_publishing_options_pane_publish_publishing_facebook_publishing_options_pane_publish, self, 0);
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp19_ = self->priv->host;
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	self->priv->publishing_options_pane = _tmp18_;
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp19_ = self->priv->publishing_options_pane;
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_signal_connect_object (_tmp19_, "logout", (GCallback) _publishing_facebook_facebook_publisher_on_publishing_options_pane_logout_publishing_facebook_publishing_options_pane_logout, self, 0);
+#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp20_ = self->priv->publishing_options_pane;
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	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"
+#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_signal_connect_object (_tmp20_, "publish", (GCallback) _publishing_facebook_facebook_publisher_on_publishing_options_pane_publish_publishing_facebook_publishing_options_pane_publish, self, 0);
+#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp21_ = self->priv->host;
+#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp22_ = self->priv->publishing_options_pane;
+#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	spit_publishing_plugin_host_install_dialog_pane (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (builder);
-#line 3224 "FacebookPublishing.c"
+#line 2973 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_do_logout (PublishingFacebookFacebookPublisher* self) {
-#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	SpitPublishingAuthenticator* _tmp0_ = NULL;
+#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:387: ACTION: clearing persistent session infor" \
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:354: ACTION: clearing persistent session infor" \
 "mation and restaring interaction.");
-#line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishing_facebook_facebook_publisher_invalidate_persistent_session (self);
-#line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp0_ = self->priv->authenticator;
+#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	spit_publishing_authenticator_logout (_tmp0_);
+#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->running = FALSE;
-#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 358 "/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 3239 "FacebookPublishing.c"
+#line 2991 "FacebookPublishing.c"
 }
 
 
@@ -3258,13 +3000,13 @@ static void publishing_facebook_facebook_publisher_do_add_new_local_album_from_j
 	PublishingFacebookPublishingParameters* _tmp20_ = NULL;
 	const gchar* _tmp21_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (album_name != NULL);
-#line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (json != NULL);
-#line 3253 "FacebookPublishing.c"
+#line 3005 "FacebookPublishing.c"
 	{
 		JsonParser* parser = NULL;
 		JsonParser* _tmp0_ = NULL;
@@ -3285,64 +3027,64 @@ static void publishing_facebook_facebook_publisher_do_add_new_local_album_from_j
 		PublishingFacebookPublishingParameters* _tmp12_ = NULL;
 		const gchar* _tmp13_ = NULL;
 		const gchar* _tmp14_ = NULL;
-#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = json_parser_new ();
-#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		parser = _tmp0_;
-#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp1_ = parser;
-#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp2_ = json;
-#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		json_parser_load_from_data (_tmp1_, _tmp2_, (gssize) -1, &_inner_error_);
-#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_object_unref0 (parser);
-#line 3288 "FacebookPublishing.c"
+#line 3040 "FacebookPublishing.c"
 			goto __catch3_g_error;
 		}
-#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp3_ = parser;
-#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp4_ = json_parser_get_root (_tmp3_);
-#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp5_ = __vala_JsonNode_copy0 (_tmp4_);
-#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		root = _tmp5_;
-#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp6_ = root;
-#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp7_ = json_node_get_object (_tmp6_);
-#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp8_ = _json_object_ref0 (_tmp7_);
-#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		response_object = _tmp8_;
-#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp9_ = response_object;
-#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp10_ = json_object_get_string_member (_tmp9_, "id");
-#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp11_ = g_strdup (_tmp10_);
-#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		album_id = _tmp11_;
-#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp12_ = self->priv->publishing_params;
-#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp13_ = album_name;
-#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp14_ = album_id;
-#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_parameters_add_album (_tmp12_, _tmp13_, _tmp14_);
-#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (album_id);
-#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_json_object_unref0 (response_object);
-#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		__vala_JsonNode_free0 (root);
-#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_object_unref0 (parser);
-#line 3331 "FacebookPublishing.c"
+#line 3083 "FacebookPublishing.c"
 	}
 	goto __finally3;
 	__catch3_g_error:
@@ -3353,652 +3095,150 @@ static void publishing_facebook_facebook_publisher_do_add_new_local_album_from_j
 		const gchar* _tmp17_ = NULL;
 		GError* _tmp18_ = NULL;
 		GError* _tmp19_ = NULL;
-#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_error_ = _inner_error_;
-#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_inner_error_ = NULL;
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp15_ = self->priv->host;
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp16_ = _error_;
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp17_ = _tmp16_->message;
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp18_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp17_);
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp19_ = _tmp18_;
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp15_, _tmp19_);
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_error_free0 (_tmp19_);
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_error_free0 (_error_);
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3364 "FacebookPublishing.c"
+#line 3116 "FacebookPublishing.c"
 	}
 	__finally3:
-#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 362 "/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 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3375 "FacebookPublishing.c"
+#line 3127 "FacebookPublishing.c"
 	}
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp20_ = self->priv->publishing_params;
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp21_ = album_name;
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_parameters_set_target_album_by_name (_tmp20_, _tmp21_);
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_do_upload (self);
-#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 3392 "FacebookPublishing.c"
+#line 3137 "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 3399 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_facebook_publisher_do_hosted_web_authentication (PublishingFacebookFacebookPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	PublishingFacebookWebAuthenticationPane* _tmp1_ = NULL;
-	PublishingFacebookWebAuthenticationPane* _tmp2_ = NULL;
-	PublishingFacebookWebAuthenticationPane* _tmp3_ = NULL;
-	SpitPublishingPluginHost* _tmp4_ = NULL;
-	PublishingFacebookWebAuthenticationPane* _tmp5_ = NULL;
-#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+static void publishing_facebook_facebook_publisher_on_authenticator_succeeded (PublishingFacebookFacebookPublisher* self) {
+#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 415 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:415: ACTION: doing hosted web authentication.");
-#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
-#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = publishing_facebook_web_authentication_pane_new ();
-#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_object_unref0 (self->priv->web_auth_pane);
-#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->web_auth_pane = _tmp1_;
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = self->priv->web_auth_pane;
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_connect_object (_tmp2_, "login-succeeded", (GCallback) _publishing_facebook_facebook_publisher_on_web_auth_pane_login_succeeded_publishing_facebook_web_authentication_pane_login_succeeded, self, 0);
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp3_ = self->priv->web_auth_pane;
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_connect_object (_tmp3_, "login-failed", (GCallback) _publishing_facebook_facebook_publisher_on_web_auth_pane_login_failed_publishing_facebook_web_authentication_pane_login_failed, self, 0);
-#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp4_ = self->priv->host;
-#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_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 3438 "FacebookPublishing.c"
-}
-
-
-static gint string_index_of (const gchar* self, const gchar* needle, gint start_index) {
-	gint result = 0;
-	gchar* _result_ = NULL;
-	gint _tmp0_ = 0;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, 0);
-#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (needle != NULL, 0);
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp0_ = start_index;
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp1_ = needle;
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp2_ = strstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_);
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_result_ = _tmp2_;
-#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp3_ = _result_;
-#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (_tmp3_ != NULL) {
-#line 3465 "FacebookPublishing.c"
-		gchar* _tmp4_ = NULL;
-#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp4_ = _result_;
-#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		return result;
-#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 3479 "FacebookPublishing.c"
-	}
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:382: EVENT: Authenticator login succeeded.");
+#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	publishing_facebook_facebook_publisher_do_authenticate_session (self);
+#line 3148 "FacebookPublishing.c"
 }
 
 
-static gchar* string_slice (const gchar* self, glong start, glong end) {
-	gchar* result = NULL;
-	glong string_length = 0L;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	glong _tmp2_ = 0L;
-	glong _tmp5_ = 0L;
-	gboolean _tmp8_ = FALSE;
-	glong _tmp9_ = 0L;
-	gboolean _tmp12_ = FALSE;
-	glong _tmp13_ = 0L;
-	glong _tmp16_ = 0L;
-	glong _tmp17_ = 0L;
-	glong _tmp18_ = 0L;
-	glong _tmp19_ = 0L;
-	glong _tmp20_ = 0L;
-	gchar* _tmp21_ = NULL;
-#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp0_ = strlen (self);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp1_ = _tmp0_;
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	string_length = (glong) _tmp1_;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp2_ = start;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (_tmp2_ < ((glong) 0)) {
-#line 3513 "FacebookPublishing.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp3_ = string_length;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp4_ = start;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		start = _tmp3_ + _tmp4_;
-#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 3528 "FacebookPublishing.c"
-		glong _tmp6_ = 0L;
-		glong _tmp7_ = 0L;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp6_ = string_length;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp7_ = end;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		end = _tmp6_ + _tmp7_;
-#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 3543 "FacebookPublishing.c"
-		glong _tmp10_ = 0L;
-		glong _tmp11_ = 0L;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp10_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp11_ = string_length;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp8_ = _tmp10_ <= _tmp11_;
-#line 3552 "FacebookPublishing.c"
-	} else {
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp8_ = FALSE;
-#line 3556 "FacebookPublishing.c"
-	}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (_tmp8_, NULL);
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp13_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (_tmp13_ >= ((glong) 0)) {
-#line 3564 "FacebookPublishing.c"
-		glong _tmp14_ = 0L;
-		glong _tmp15_ = 0L;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp14_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp15_ = string_length;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp12_ = _tmp14_ <= _tmp15_;
-#line 3573 "FacebookPublishing.c"
-	} else {
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp12_ = FALSE;
-#line 3577 "FacebookPublishing.c"
-	}
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (_tmp12_, NULL);
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp16_ = start;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp17_ = end;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp18_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp19_ = end;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp20_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	result = _tmp21_;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	return result;
-#line 3599 "FacebookPublishing.c"
+static void publishing_facebook_facebook_publisher_on_authenticator_failed (PublishingFacebookFacebookPublisher* self) {
+#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
+#line 3155 "FacebookPublishing.c"
 }
 
 
-static gint string_index_of_char (const gchar* self, gunichar c, gint start_index) {
-	gint result = 0;
-	gchar* _result_ = NULL;
-	gint _tmp0_ = 0;
-	gunichar _tmp1_ = 0U;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 1007 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, 0);
-#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp0_ = start_index;
-#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp1_ = c;
-#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp2_ = g_utf8_strchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
-#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_result_ = _tmp2_;
-#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp3_ = _result_;
-#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (_tmp3_ != NULL) {
-#line 3624 "FacebookPublishing.c"
-		gchar* _tmp4_ = NULL;
-#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp4_ = _result_;
-#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		return result;
-#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 3638 "FacebookPublishing.c"
-	}
+static gpointer _g_variant_ref0 (gpointer self) {
+#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	return self ? g_variant_ref (self) : NULL;
+#line 3162 "FacebookPublishing.c"
 }
 
 
-static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
-	gchar* result = NULL;
-	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	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 3652 "FacebookPublishing.c"
-	{
-		GRegex* regex = NULL;
-		const gchar* _tmp0_ = NULL;
-		gchar* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		GRegex* _tmp3_ = NULL;
-		GRegex* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		GRegex* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		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 3683 "FacebookPublishing.c"
-				goto __catch4_g_regex_error;
-			}
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-			return NULL;
-#line 3692 "FacebookPublishing.c"
-		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 3708 "FacebookPublishing.c"
-				goto __catch4_g_regex_error;
-			}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-			return NULL;
-#line 3719 "FacebookPublishing.c"
-		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		return result;
-#line 3733 "FacebookPublishing.c"
-	}
-	goto __finally4;
-	__catch4_g_regex_error:
-	{
-		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+static void publishing_facebook_facebook_publisher_do_authenticate_session (PublishingFacebookFacebookPublisher* self) {
+	GHashTable* parameter = NULL;
+	SpitPublishingAuthenticator* _tmp0_ = NULL;
+	GHashTable* _tmp1_ = NULL;
+	GVariant* access_token = NULL;
+	gconstpointer _tmp2_ = NULL;
+	gboolean _tmp3_ = FALSE;
+	GVariant* _tmp4_ = NULL;
+	PublishingFacebookGraphSession* _tmp5_ = NULL;
+	PublishingFacebookGraphSession* _tmp6_ = NULL;
+	const gchar* _tmp7_ = NULL;
+#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
+#line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp0_ = self->priv->authenticator;
+#line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp1_ = spit_publishing_authenticator_get_authentication_parameter (_tmp0_);
+#line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	parameter = _tmp1_;
+#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp3_ = g_hash_table_lookup_extended (parameter, "AccessToken", NULL, &_tmp2_);
+#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_g_variant_unref0 (access_token);
+#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp4_ = _g_variant_ref0 (_tmp2_);
+#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	access_token = _tmp4_;
+#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	if (!_tmp3_) {
+#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		g_critical ("FacebookPublishing.vala:394: Authenticator signalled success, but does" \
+" not provide access token");
+#line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_error_free0 (e);
-#line 3747 "FacebookPublishing.c"
+#line 3199 "FacebookPublishing.c"
 	}
-	__finally4:
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		return NULL;
-#line 3758 "FacebookPublishing.c"
-	}
-}
-
-
-static void publishing_facebook_facebook_publisher_do_authenticate_session (PublishingFacebookFacebookPublisher* self, const gchar* good_login_uri) {
-	const gchar* _tmp0_ = NULL;
-	gchar* decoded_uri = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* access_token = NULL;
-	gint index = 0;
-	const gchar* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	const gchar* _tmp12_ = NULL;
-	gchar* trailing_params = NULL;
-	const gchar* _tmp16_ = NULL;
-	gint _tmp17_ = 0;
-	gint _tmp18_ = 0;
-	const gchar* _tmp25_ = NULL;
-	const gchar* _tmp29_ = NULL;
-	gchar* _tmp30_ = NULL;
-	PublishingFacebookGraphSession* _tmp31_ = NULL;
-	PublishingFacebookGraphSession* _tmp32_ = NULL;
-	const gchar* _tmp33_ = NULL;
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_if_fail (good_login_uri != NULL);
-#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = good_login_uri;
-#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:429: ACTION: preparing to extract session info" \
-"rmation encoded in uri = '%s'", _tmp0_);
-#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = good_login_uri;
-#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = soup_uri_decode (_tmp1_);
-#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	decoded_uri = _tmp2_;
-#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	access_token = NULL;
-#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp3_ = decoded_uri;
-#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp4_ = string_index_of (_tmp3_, "#access_token=", 0);
-#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	index = _tmp4_;
-#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = index;
-#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp5_ >= 0) {
-#line 3810 "FacebookPublishing.c"
-		const gchar* _tmp6_ = NULL;
-		gint _tmp7_ = 0;
-		const gchar* _tmp8_ = NULL;
-		gint _tmp9_ = 0;
-		gint _tmp10_ = 0;
-		gchar* _tmp11_ = NULL;
-#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp6_ = decoded_uri;
-#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp7_ = index;
-#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp8_ = decoded_uri;
-#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp9_ = strlen (_tmp8_);
-#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp10_ = _tmp9_;
-#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp11_ = string_slice (_tmp6_, (glong) _tmp7_, (glong) _tmp10_);
-#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_g_free0 (access_token);
-#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		access_token = _tmp11_;
-#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 3839 "FacebookPublishing.c"
-		SpitPublishingPluginHost* _tmp13_ = NULL;
-		GError* _tmp14_ = NULL;
-		GError* _tmp15_ = NULL;
-#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp13_ = self->priv->host;
-#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp14_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Server redirect URL contained no access token");
-#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp15_ = _tmp14_;
-#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp13_, _tmp15_);
-#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_g_error_free0 (_tmp15_);
-#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_g_free0 (access_token);
-#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_g_free0 (decoded_uri);
-#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		return;
-#line 3859 "FacebookPublishing.c"
-	}
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	trailing_params = NULL;
-#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp16_ = access_token;
-#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp17_ = string_index_of_char (_tmp16_, (gunichar) '&', 0);
-#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	index = _tmp17_;
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp18_ = index;
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp18_ >= 0) {
-#line 3873 "FacebookPublishing.c"
-		const gchar* _tmp19_ = NULL;
-		gint _tmp20_ = 0;
-		const gchar* _tmp21_ = NULL;
-		gint _tmp22_ = 0;
-		gint _tmp23_ = 0;
-		gchar* _tmp24_ = NULL;
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp19_ = access_token;
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp20_ = index;
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp21_ = access_token;
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp22_ = strlen (_tmp21_);
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp23_ = _tmp22_;
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp24_ = string_slice (_tmp19_, (glong) _tmp20_, (glong) _tmp23_);
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_g_free0 (trailing_params);
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		trailing_params = _tmp24_;
-#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 3902 "FacebookPublishing.c"
-		const gchar* _tmp26_ = NULL;
-		const gchar* _tmp27_ = NULL;
-		gchar* _tmp28_ = NULL;
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp26_ = access_token;
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp27_ = trailing_params;
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp28_ = string_replace (_tmp26_, _tmp27_, "");
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_g_free0 (access_token);
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		access_token = _tmp28_;
-#line 3916 "FacebookPublishing.c"
-	}
-#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp29_ = access_token;
-#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp30_ = string_replace (_tmp29_, "#access_token=", "");
-#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (access_token);
-#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	access_token = _tmp30_;
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp31_ = self->priv->graph_session;
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_connect_object (_tmp31_, "authenticated", (GCallback) _publishing_facebook_facebook_publisher_on_session_authenticated_publishing_facebook_graph_session_authenticated, self, 0);
-#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp32_ = self->priv->graph_session;
-#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp33_ = access_token;
-#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishing_facebook_graph_session_authenticate (_tmp32_, _tmp33_);
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (trailing_params);
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (access_token);
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (decoded_uri);
-#line 3942 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_facebook_publisher_do_save_session_information (PublishingFacebookFacebookPublisher* self) {
-	PublishingFacebookGraphSession* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:463: ACTION: saving session information to con" \
-"figuration system.");
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = self->priv->graph_session;
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = publishing_facebook_graph_session_get_access_token (_tmp0_);
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = _tmp1_;
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	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 3964 "FacebookPublishing.c"
+#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp5_ = self->priv->graph_session;
+#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_signal_connect_object (_tmp5_, "authenticated", (GCallback) _publishing_facebook_facebook_publisher_on_session_authenticated_publishing_facebook_graph_session_authenticated, self, 0);
+#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp6_ = self->priv->graph_session;
+#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp7_ = g_variant_get_string (access_token, NULL);
+#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	publishing_facebook_graph_session_authenticate (_tmp6_, _tmp7_);
+#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_g_variant_unref0 (access_token);
+#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_g_hash_table_unref0 (parameter);
+#line 3215 "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"
+#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_upload_complete ((PublishingFacebookFacebookPublisher*) self, _sender, num_photos_published);
-#line 3971 "FacebookPublishing.c"
+#line 3222 "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"
+#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_upload_error ((PublishingFacebookFacebookPublisher*) self, _sender, err);
-#line 3978 "FacebookPublishing.c"
+#line 3229 "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"
+#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_upload_status_updated ((PublishingFacebookFacebookPublisher*) self, file_number, fraction_complete);
-#line 3985 "FacebookPublishing.c"
+#line 3236 "FacebookPublishing.c"
 }
 
 
@@ -4031,326 +3271,165 @@ static void publishing_facebook_facebook_publisher_do_upload (PublishingFacebook
 	PublishingFacebookUploader* _tmp24_ = NULL;
 	PublishingFacebookUploader* _tmp25_ = NULL;
 	PublishingFacebookUploader* _tmp26_ = NULL;
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->publishing_params;
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = _tmp1_->target_album;
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp2_ == PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM) {
-#line 4026 "FacebookPublishing.c"
+#line 3277 "FacebookPublishing.c"
 		gchar* _tmp3_ = NULL;
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp3_ = g_strdup ("(none)");
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp0_);
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = _tmp3_;
-#line 4034 "FacebookPublishing.c"
+#line 3285 "FacebookPublishing.c"
 	} else {
 		PublishingFacebookPublishingParameters* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp4_ = self->priv->publishing_params;
-#line 471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp5_ = publishing_facebook_publishing_parameters_get_target_album_name (_tmp4_);
-#line 471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp0_);
-#line 471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = _tmp5_;
-#line 4046 "FacebookPublishing.c"
+#line 3297 "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_);
-#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:402: ACTION: uploading photos to album '%s'", _tmp0_);
+#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = self->priv->host;
-#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp6_, TRUE);
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = self->priv->host;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = self->priv->publishing_params;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp9_ = _tmp8_->resolution;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = publishing_facebook_resolution_get_pixels (_tmp9_);
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp11_ = self->priv->publishing_params;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp12_ = _tmp11_->strip_metadata;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp15_ = spit_publishing_plugin_host_serialize_publishables (_tmp7_, _tmp10_, _tmp12_, &_tmp13_, &_tmp14_);
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->progress_reporter = NULL;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->progress_reporter_target = NULL;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->progress_reporter = _tmp15_;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->progress_reporter_target = _tmp13_;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = _tmp14_;
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 415 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp16_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 415 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp16_) {
-#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp0_);
-#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4090 "FacebookPublishing.c"
+#line 3341 "FacebookPublishing.c"
 	}
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp17_ = self->priv->host;
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp19_ = spit_publishing_plugin_host_get_publishables (_tmp17_, &_tmp18_);
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishables = _tmp19_;
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishables_length1 = _tmp18_;
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishables_size_ = publishables_length1;
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp20_ = self->priv->graph_session;
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp21_ = self->priv->publishing_params;
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp22_ = publishables;
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp22__length1 = publishables_length1;
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp23_ = publishing_facebook_uploader_new (_tmp20_, _tmp21_, _tmp22_, _tmp22__length1);
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_uploader_unref0 (self->priv->uploader);
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->uploader = _tmp23_;
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp24_ = self->priv->uploader;
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect_object (_tmp24_, "upload-complete", (GCallback) _publishing_facebook_facebook_publisher_on_upload_complete_publishing_facebook_uploader_upload_complete, self, 0);
-#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp25_ = self->priv->uploader;
-#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect_object (_tmp25_, "upload-error", (GCallback) _publishing_facebook_facebook_publisher_on_upload_error_publishing_facebook_uploader_upload_error, self, 0);
-#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp26_ = self->priv->uploader;
-#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_uploader_upload (_tmp26_, _publishing_facebook_facebook_publisher_on_upload_status_updated_spit_publishing_progress_callback, self);
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp0_);
-#line 4132 "FacebookPublishing.c"
+#line 3383 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_do_show_success_pane (PublishingFacebookFacebookPublisher* self) {
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	SpitPublishingPluginHost* _tmp1_ = NULL;
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:495: ACTION: showing success pane.");
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:428: ACTION: showing success pane.");
+#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->host;
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spit_publishing_plugin_host_install_success_pane (_tmp1_);
-#line 4151 "FacebookPublishing.c"
+#line 3402 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_on_generic_error (PublishingFacebookFacebookPublisher* self, GError* _error_) {
 	GError* _tmp0_ = NULL;
-#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = _error_;
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	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"
+#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_facebook_publisher_do_logout (self);
-#line 4165 "FacebookPublishing.c"
+#line 3416 "FacebookPublishing.c"
 	} else {
 		SpitPublishingPluginHost* _tmp1_ = NULL;
 		GError* _tmp2_ = NULL;
-#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp1_ = self->priv->host;
-#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp2_ = _error_;
-#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp1_, _tmp2_);
-#line 4175 "FacebookPublishing.c"
-	}
-}
-
-
-static void publishing_facebook_facebook_publisher_on_login_clicked (PublishingFacebookFacebookPublisher* self) {
-	gboolean _tmp0_ = FALSE;
-#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (!_tmp0_) {
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		return;
-#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 4196 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_facebook_publisher_on_endpoint_test_completed (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message) {
-	PublishingFacebookGraphMessage* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingFacebookGraphMessage* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
-#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = message;
-#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
-#line 518 "/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_facebook_publisher_on_endpoint_test_completed_publishing_facebook_graph_message_completed, self);
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = message;
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp3_, NULL, FALSE);
-#line 519 "/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_facebook_publisher_on_endpoint_test_error_publishing_facebook_graph_message_failed, self);
-#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (!_tmp4_) {
-#line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		return;
-#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 4234 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_facebook_publisher_on_endpoint_test_error (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message, GError* _error_) {
-	PublishingFacebookGraphMessage* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingFacebookGraphMessage* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	GError* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	GError* _tmp9_ = NULL;
-#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = message;
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
-#line 531 "/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_facebook_publisher_on_endpoint_test_completed_publishing_facebook_graph_message_completed, self);
-#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = message;
-#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp3_, NULL, FALSE);
-#line 532 "/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_facebook_publisher_on_endpoint_test_error_publishing_facebook_graph_message_failed, self);
-#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (!_tmp4_) {
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		return;
-#line 4271 "FacebookPublishing.c"
-	}
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = _error_;
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp6_ = _tmp5_->message;
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp7_ = g_strconcat ("EVENT: endpoint test transaction failed to detect a connection to the " \
-"Facebook " "endpoint", _tmp6_, NULL);
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp8_ = _tmp7_;
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:537: %s", _tmp8_);
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (_tmp8_);
-#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp9_ = _error_;
-#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishing_facebook_facebook_publisher_on_generic_error (self, _tmp9_);
-#line 4289 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_facebook_publisher_on_web_auth_pane_login_succeeded (PublishingFacebookFacebookPublisher* self, const gchar* success_url) {
-	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_if_fail (success_url != NULL);
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (!_tmp0_) {
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		return;
-#line 4306 "FacebookPublishing.c"
+#line 3426 "FacebookPublishing.c"
 	}
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:547: EVENT: hosted web login succeeded.");
-#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = success_url;
-#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishing_facebook_facebook_publisher_do_authenticate_session (self, _tmp1_);
-#line 4314 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_facebook_publisher_on_web_auth_pane_login_failed (PublishingFacebookFacebookPublisher* self) {
-	gboolean _tmp0_ = FALSE;
-#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (!_tmp0_) {
-#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		return;
-#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 4334 "FacebookPublishing.c"
 }
 
 
@@ -4360,36 +3439,34 @@ static void publishing_facebook_facebook_publisher_on_session_authenticated (Pub
 	gboolean _tmp2_ = FALSE;
 	PublishingFacebookGraphSession* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->graph_session;
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("authenticated", PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION, &_tmp1_, NULL, FALSE);
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 470 "/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_facebook_publisher_on_session_authenticated_publishing_facebook_graph_session_authenticated, self);
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp2_) {
-#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4358 "FacebookPublishing.c"
+#line 3451 "FacebookPublishing.c"
 	}
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = self->priv->graph_session;
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = publishing_facebook_graph_session_is_authenticated (_tmp3_);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_assert (_tmp4_, "graph_session.is_authenticated()");
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:576: EVENT: an authenticated session has becom" \
+#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:476: EVENT: an authenticated session has becom" \
 "e available.");
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishing_facebook_facebook_publisher_do_save_session_information (self);
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_do_fetch_user_info (self);
-#line 4372 "FacebookPublishing.c"
+#line 3463 "FacebookPublishing.c"
 }
 
 
@@ -4405,52 +3482,52 @@ static void publishing_facebook_facebook_publisher_on_fetch_user_info_completed
 	PublishingFacebookGraphMessage* _tmp8_ = NULL;
 	gchar* _tmp9_ = NULL;
 	gchar* _tmp10_ = NULL;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
-#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = message;
-#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
-#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 482 "/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_facebook_publisher_on_fetch_user_info_completed_publishing_facebook_graph_message_completed, self);
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = message;
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp3_, NULL, FALSE);
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 483 "/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_facebook_publisher_on_fetch_user_info_error_publishing_facebook_graph_message_failed, self);
-#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp4_) {
-#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4410 "FacebookPublishing.c"
+#line 3501 "FacebookPublishing.c"
 	}
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = message;
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = publishing_facebook_graph_message_get_response_body (_tmp5_);
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = _tmp6_;
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:589: EVENT: user info fetch completed; respons" \
+#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:488: EVENT: user info fetch completed; respons" \
 "e = '%s'.", _tmp7_);
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp7_);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = message;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp9_ = publishing_facebook_graph_message_get_response_body (_tmp8_);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = _tmp9_;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_do_extract_user_info_from_json (self, _tmp10_);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp10_);
-#line 4432 "FacebookPublishing.c"
+#line 3523 "FacebookPublishing.c"
 }
 
 
@@ -4461,38 +3538,38 @@ static void publishing_facebook_facebook_publisher_on_fetch_user_info_error (Pub
 	guint _tmp3_ = 0U;
 	gboolean _tmp4_ = FALSE;
 	GError* _tmp5_ = NULL;
-#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
-#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = message;
-#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
-#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 495 "/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_facebook_publisher_on_fetch_user_info_completed_publishing_facebook_graph_message_completed, self);
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = message;
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp3_, NULL, FALSE);
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 496 "/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_facebook_publisher_on_fetch_user_info_error_publishing_facebook_graph_message_failed, self);
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp4_) {
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4465 "FacebookPublishing.c"
+#line 3556 "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" \
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:501: EVENT: fetching user info generated and e" \
 "rror.");
-#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = _error_;
-#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_generic_error (self, _tmp5_);
-#line 4473 "FacebookPublishing.c"
+#line 3564 "FacebookPublishing.c"
 }
 
 
@@ -4500,26 +3577,26 @@ static void publishing_facebook_facebook_publisher_on_user_info_extracted (Publi
 	gboolean _tmp0_ = FALSE;
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp0_) {
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4489 "FacebookPublishing.c"
+#line 3580 "FacebookPublishing.c"
 	}
-#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->uid;
-#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = self->priv->username;
-#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:611: EVENT: user info extracted from JSON resp" \
+#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:510: EVENT: user info extracted from JSON resp" \
 "onse: uid = %s; name = %s.", _tmp1_, _tmp2_);
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_do_fetch_album_descriptions (self);
-#line 4499 "FacebookPublishing.c"
+#line 3590 "FacebookPublishing.c"
 }
 
 
@@ -4535,52 +3612,52 @@ static void publishing_facebook_facebook_publisher_on_fetch_albums_completed (Pu
 	PublishingFacebookGraphMessage* _tmp8_ = NULL;
 	gchar* _tmp9_ = NULL;
 	gchar* _tmp10_ = NULL;
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = message;
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 516 "/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_facebook_publisher_on_fetch_albums_completed_publishing_facebook_graph_message_completed, self);
-#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = message;
-#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp3_, NULL, FALSE);
-#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 517 "/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_facebook_publisher_on_fetch_albums_error_publishing_facebook_graph_message_failed, self);
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp4_) {
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4537 "FacebookPublishing.c"
+#line 3628 "FacebookPublishing.c"
 	}
-#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = message;
-#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = publishing_facebook_graph_message_get_response_body (_tmp5_);
-#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = _tmp6_;
-#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:623: EVENT: album descriptions fetch transacti" \
+#line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:522: EVENT: album descriptions fetch transacti" \
 "on completed; response = '%s'.", _tmp7_);
-#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp7_);
-#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = message;
-#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp9_ = publishing_facebook_graph_message_get_response_body (_tmp8_);
-#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = _tmp9_;
-#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_do_extract_albums_from_json (self, _tmp10_);
-#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp10_);
-#line 4559 "FacebookPublishing.c"
+#line 3650 "FacebookPublishing.c"
 }
 
 
@@ -4591,38 +3668,38 @@ static void publishing_facebook_facebook_publisher_on_fetch_albums_error (Publis
 	guint _tmp3_ = 0U;
 	gboolean _tmp4_ = FALSE;
 	GError* _tmp5_ = NULL;
-#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
-#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = message;
-#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
-#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 530 "/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_facebook_publisher_on_fetch_albums_completed_publishing_facebook_graph_message_completed, self);
-#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = message;
-#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp3_, NULL, FALSE);
-#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 531 "/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_facebook_publisher_on_fetch_albums_error_publishing_facebook_graph_message_failed, self);
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp4_) {
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4592 "FacebookPublishing.c"
+#line 3683 "FacebookPublishing.c"
 	}
-#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:637: EVENT: album description fetch attempt ge" \
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:536: EVENT: album description fetch attempt ge" \
 "nerated an error.");
-#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = err;
-#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_generic_error (self, _tmp5_);
-#line 4600 "FacebookPublishing.c"
+#line 3691 "FacebookPublishing.c"
 }
 
 
@@ -4631,28 +3708,28 @@ static void publishing_facebook_facebook_publisher_on_albums_extracted (Publishi
 	PublishingFacebookPublishingParameters* _tmp1_ = NULL;
 	PublishingFacebookAlbum** _tmp2_ = NULL;
 	gint _tmp2__length1 = 0;
-#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp0_) {
-#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4617 "FacebookPublishing.c"
+#line 3708 "FacebookPublishing.c"
 	}
-#line 646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->publishing_params;
-#line 646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = _tmp1_->albums;
-#line 646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2__length1 = _tmp1_->albums_length1;
-#line 646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:646: EVENT: successfully extracted %d albums f" \
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:545: EVENT: successfully extracted %d albums f" \
 "rom JSON response", _tmp2__length1);
-#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_do_show_publishing_options_pane (self);
-#line 4629 "FacebookPublishing.c"
+#line 3720 "FacebookPublishing.c"
 }
 
 
@@ -4662,34 +3739,34 @@ static void publishing_facebook_facebook_publisher_on_publishing_options_pane_lo
 	PublishingFacebookPublishingOptionsPane* _tmp2_ = NULL;
 	guint _tmp3_ = 0U;
 	gboolean _tmp4_ = FALSE;
-#line 652 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->publishing_options_pane;
-#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("publish", PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE);
-#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 552 "/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_facebook_publisher_on_publishing_options_pane_publish_publishing_facebook_publishing_options_pane_publish, self);
-#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = self->priv->publishing_options_pane;
-#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("logout", PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp3_, NULL, FALSE);
-#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 553 "/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_facebook_publisher_on_publishing_options_pane_logout_publishing_facebook_publishing_options_pane_logout, self);
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp4_) {
-#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4659 "FacebookPublishing.c"
+#line 3750 "FacebookPublishing.c"
 	}
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:659: EVENT: user clicked 'Logout' in publishin" \
+#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:558: EVENT: user clicked 'Logout' in publishin" \
 "g options pane.");
-#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_do_logout (self);
-#line 4665 "FacebookPublishing.c"
+#line 3756 "FacebookPublishing.c"
 }
 
 
@@ -4709,109 +3786,109 @@ static void publishing_facebook_facebook_publisher_on_publishing_options_pane_pu
 	const gchar* _tmp12_ = NULL;
 	gchar* _tmp13_ = NULL;
 	const gchar* _tmp14_ = NULL;
-#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (privacy_setting != NULL);
-#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->publishing_options_pane;
-#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("publish", PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE);
-#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 565 "/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_facebook_publisher_on_publishing_options_pane_publish_publishing_facebook_publishing_options_pane_publish, self);
-#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = self->priv->publishing_options_pane;
-#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("logout", PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp3_, NULL, FALSE);
-#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 566 "/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_facebook_publisher_on_publishing_options_pane_logout_publishing_facebook_publishing_options_pane_logout, self);
-#line 669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp4_) {
-#line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4707 "FacebookPublishing.c"
+#line 3798 "FacebookPublishing.c"
 	}
-#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:672: EVENT: user clicked 'Publish' in publishi" \
+#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:571: EVENT: user clicked 'Publish' in publishi" \
 "ng options pane.");
-#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = self->priv->publishing_params;
-#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = strip_metadata;
-#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_->strip_metadata = _tmp6_;
-#line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = strip_metadata;
-#line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_set_persistent_strip_metadata (self, _tmp7_);
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = self->priv->publishing_params;
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp9_ = resolution;
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_->resolution = _tmp9_;
-#line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = resolution;
-#line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_set_persistent_default_size (self, (gint) _tmp10_);
-#line 678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp11_ = self->priv->publishing_params;
-#line 678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp12_ = privacy_setting;
-#line 678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp13_ = g_strdup (_tmp12_);
-#line 678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp11_->privacy_object);
-#line 678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp11_->privacy_object = _tmp13_;
-#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp14_ = target_album;
-#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp14_ != NULL) {
-#line 4745 "FacebookPublishing.c"
+#line 3836 "FacebookPublishing.c"
 		PublishingFacebookPublishingParameters* _tmp15_ = NULL;
 		const gchar* _tmp16_ = NULL;
 		PublishingFacebookPublishingParameters* _tmp17_ = NULL;
 		gint _tmp18_ = 0;
-#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp15_ = self->priv->publishing_params;
-#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp16_ = target_album;
-#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_parameters_set_target_album_by_name (_tmp15_, _tmp16_);
-#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp17_ = self->priv->publishing_params;
-#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp18_ = _tmp17_->target_album;
-#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (_tmp18_ != PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM) {
-#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			publishing_facebook_facebook_publisher_do_upload (self);
-#line 4764 "FacebookPublishing.c"
+#line 3855 "FacebookPublishing.c"
 		} else {
 			PublishingFacebookPublishingParameters* _tmp19_ = NULL;
 			const gchar* _tmp20_ = NULL;
 			gchar* _tmp21_ = NULL;
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp19_ = self->priv->publishing_params;
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp20_ = target_album;
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp21_ = g_strdup (_tmp20_);
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_free0 (_tmp19_->new_album_name);
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp19_->new_album_name = _tmp21_;
-#line 688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			publishing_facebook_facebook_publisher_do_create_new_album (self);
-#line 4781 "FacebookPublishing.c"
+#line 3872 "FacebookPublishing.c"
 		}
 	} else {
-#line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_facebook_publisher_do_upload (self);
-#line 4786 "FacebookPublishing.c"
+#line 3877 "FacebookPublishing.c"
 	}
 }
 
@@ -4832,62 +3909,62 @@ static void publishing_facebook_facebook_publisher_on_create_album_completed (Pu
 	PublishingFacebookGraphMessage* _tmp12_ = NULL;
 	gchar* _tmp13_ = NULL;
 	gchar* _tmp14_ = NULL;
-#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
-#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = message;
-#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
-#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 596 "/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_facebook_publisher_on_create_album_completed_publishing_facebook_graph_message_completed, self);
-#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = message;
-#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp3_, NULL, FALSE);
-#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 597 "/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_facebook_publisher_on_create_album_error_publishing_facebook_graph_message_failed, self);
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = self->priv->publishing_params;
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = _tmp4_->new_album_name;
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_assert (_tmp5_ != NULL, "publishing_params.new_album_name != null");
-#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp6_) {
-#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4835 "FacebookPublishing.c"
+#line 3926 "FacebookPublishing.c"
 	}
-#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = message;
-#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = publishing_facebook_graph_message_get_response_body (_tmp7_);
-#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp9_ = _tmp8_;
-#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:705: EVENT: created new album resource on remo" \
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:604: EVENT: created new album resource on remo" \
 "te host; response body = %s.\n", _tmp9_);
-#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp9_);
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = self->priv->publishing_params;
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp11_ = _tmp10_->new_album_name;
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp12_ = message;
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp13_ = publishing_facebook_graph_message_get_response_body (_tmp12_);
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp14_ = _tmp13_;
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	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"
+#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp14_);
-#line 4861 "FacebookPublishing.c"
+#line 3952 "FacebookPublishing.c"
 }
 
 
@@ -4898,38 +3975,38 @@ static void publishing_facebook_facebook_publisher_on_create_album_error (Publis
 	guint _tmp3_ = 0U;
 	gboolean _tmp4_ = FALSE;
 	GError* _tmp5_ = NULL;
-#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = message;
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 612 "/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_facebook_publisher_on_create_album_completed_publishing_facebook_graph_message_completed, self);
-#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = message;
-#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp3_, NULL, FALSE);
-#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 613 "/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_facebook_publisher_on_create_album_error_publishing_facebook_graph_message_failed, self);
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp4_) {
-#line 717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4894 "FacebookPublishing.c"
+#line 3985 "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" \
+#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:618: EVENT: attempt to create new album genera" \
 "ted an error.");
-#line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = err;
-#line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_generic_error (self, _tmp5_);
-#line 4902 "FacebookPublishing.c"
+#line 3993 "FacebookPublishing.c"
 }
 
 
@@ -4942,38 +4019,38 @@ static void publishing_facebook_facebook_publisher_on_upload_status_updated (Pub
 	void* _tmp3__target = NULL;
 	gint _tmp4_ = 0;
 	gdouble _tmp5_ = 0.0;
-#line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp0_) {
-#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4923 "FacebookPublishing.c"
+#line 4014 "FacebookPublishing.c"
 	}
-#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = completed_fraction;
-#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:728: EVENT: uploader reports upload %.2f perce" \
+#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:627: EVENT: uploader reports upload %.2f perce" \
 "nt complete.", 100.0 * _tmp1_);
-#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = self->priv->progress_reporter;
-#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2__target = self->priv->progress_reporter_target;
-#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_assert (_tmp2_ != NULL, "progress_reporter != null");
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = self->priv->progress_reporter;
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3__target = self->priv->progress_reporter_target;
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = file_number;
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = completed_fraction;
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 4945 "FacebookPublishing.c"
+#line 4036 "FacebookPublishing.c"
 }
 
 
@@ -4984,38 +4061,38 @@ static void publishing_facebook_facebook_publisher_on_upload_complete (Publishin
 	guint _tmp3_ = 0U;
 	gboolean _tmp4_ = FALSE;
 	gint _tmp5_ = 0;
-#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (uploader));
-#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = uploader;
-#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("upload-complete", PUBLISHING_FACEBOOK_TYPE_UPLOADER, &_tmp1_, NULL, FALSE);
-#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 635 "/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_facebook_publisher_on_upload_complete_publishing_facebook_uploader_upload_complete, self);
-#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = uploader;
-#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("upload-error", PUBLISHING_FACEBOOK_TYPE_UPLOADER, &_tmp3_, NULL, FALSE);
-#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 636 "/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_facebook_publisher_on_upload_error_publishing_facebook_uploader_upload_error, self);
-#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp4_) {
-#line 740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4978 "FacebookPublishing.c"
+#line 4069 "FacebookPublishing.c"
 	}
-#line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = num_published;
-#line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:742: EVENT: uploader reports upload complete; " \
+#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:641: EVENT: uploader reports upload complete; " \
 "%d items published.", _tmp5_);
-#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_do_show_success_pane (self);
-#line 4986 "FacebookPublishing.c"
+#line 4077 "FacebookPublishing.c"
 }
 
 
@@ -5029,44 +4106,44 @@ static void publishing_facebook_facebook_publisher_on_upload_error (PublishingFa
 	const gchar* _tmp6_ = NULL;
 	SpitPublishingPluginHost* _tmp7_ = NULL;
 	GError* _tmp8_ = NULL;
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (uploader));
-#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = uploader;
-#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("upload-complete", PUBLISHING_FACEBOOK_TYPE_UPLOADER, &_tmp1_, NULL, FALSE);
-#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 647 "/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_facebook_publisher_on_upload_complete_publishing_facebook_uploader_upload_complete, self);
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = uploader;
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("upload-error", PUBLISHING_FACEBOOK_TYPE_UPLOADER, &_tmp3_, NULL, FALSE);
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 648 "/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_facebook_publisher_on_upload_error_publishing_facebook_uploader_upload_error, self);
-#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp4_) {
-#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 5022 "FacebookPublishing.c"
+#line 4113 "FacebookPublishing.c"
 	}
-#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = err;
-#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = _tmp5_->message;
-#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:754: EVENT: uploader reports upload error = '%" \
+#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:653: EVENT: uploader reports upload error = '%" \
 "s'.", _tmp6_);
-#line 756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = self->priv->host;
-#line 756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = err;
-#line 756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 5036 "FacebookPublishing.c"
+#line 4127 "FacebookPublishing.c"
 }
 
 
@@ -5075,47 +4152,61 @@ static SpitPublishingService* publishing_facebook_facebook_publisher_real_get_se
 	SpitPublishingService* result = NULL;
 	SpitPublishingService* _tmp0_ = NULL;
 	SpitPublishingService* _tmp1_ = NULL;
-#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_TYPE_FACEBOOK_PUBLISHER, PublishingFacebookFacebookPublisher);
-#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->service;
-#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp1_;
-#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 5055 "FacebookPublishing.c"
+#line 4146 "FacebookPublishing.c"
 }
 
 
 gchar* publishing_facebook_facebook_publisher_get_service_name (PublishingFacebookFacebookPublisher* self) {
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self), NULL);
-#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = g_strdup (PUBLISHING_FACEBOOK_SERVICE_NAME);
-#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp0_;
-#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 5070 "FacebookPublishing.c"
+#line 4161 "FacebookPublishing.c"
 }
 
 
 gchar* publishing_facebook_facebook_publisher_get_user_visible_name (PublishingFacebookFacebookPublisher* self) {
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-#line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self), NULL);
-#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = g_strdup (PUBLISHING_FACEBOOK_USER_VISIBLE_NAME);
-#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp0_;
-#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 5085 "FacebookPublishing.c"
+#line 4176 "FacebookPublishing.c"
+}
+
+
+static void _publishing_facebook_facebook_publisher_on_authenticator_succeeded_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender, gpointer self) {
+#line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	publishing_facebook_facebook_publisher_on_authenticator_succeeded ((PublishingFacebookFacebookPublisher*) self);
+#line 4183 "FacebookPublishing.c"
+}
+
+
+static void _publishing_facebook_facebook_publisher_on_authenticator_failed_spit_publishing_authenticator_authentication_failed (SpitPublishingAuthenticator* _sender, gpointer self) {
+#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	publishing_facebook_facebook_publisher_on_authenticator_failed ((PublishingFacebookFacebookPublisher*) self);
+#line 4190 "FacebookPublishing.c"
 }
 
 
@@ -5123,97 +4214,69 @@ static void publishing_facebook_facebook_publisher_real_start (SpitPublishingPub
 	PublishingFacebookFacebookPublisher * self;
 	gboolean _tmp0_ = FALSE;
 	PublishingFacebookPublishingParameters* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-#line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	SpitPublishingAuthenticator* _tmp2_ = NULL;
+	SpitPublishingAuthenticator* _tmp3_ = NULL;
+	SpitPublishingAuthenticator* _tmp4_ = NULL;
+#line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_TYPE_FACEBOOK_PUBLISHER, PublishingFacebookFacebookPublisher);
-#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp0_) {
-#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 5102 "FacebookPublishing.c"
+#line 4209 "FacebookPublishing.c"
 	}
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:775: FacebookPublisher: starting interaction.");
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:674: FacebookPublisher: starting interaction.");
+#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->running = TRUE;
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = publishing_facebook_publishing_parameters_new ();
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_publishing_parameters_unref0 (self->priv->publishing_params);
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->publishing_params = _tmp1_;
-#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = publishing_facebook_facebook_publisher_is_persistent_session_valid (self);
-#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp2_) {
-#line 5118 "FacebookPublishing.c"
-		PublishingFacebookGraphSession* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp3_ = self->priv->graph_session;
-#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp4_ = publishing_facebook_facebook_publisher_get_persistent_access_token (self);
-#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp5_ = _tmp4_;
-#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		publishing_facebook_graph_session_authenticate (_tmp3_, _tmp5_);
-#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_g_free0 (_tmp5_);
-#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 5139 "FacebookPublishing.c"
-			SpitPublishingPluginHost* _tmp7_ = NULL;
-			SpitPublishingPluginHost* _tmp8_ = NULL;
-#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp7_ = self->priv->host;
-#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			spit_publishing_plugin_host_set_service_locked (_tmp7_, FALSE);
-#line 791 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_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 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 5154 "FacebookPublishing.c"
-		}
-	}
+#line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp2_ = self->priv->authenticator;
+#line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_signal_connect_object (_tmp2_, "authenticated", (GCallback) _publishing_facebook_facebook_publisher_on_authenticator_succeeded_spit_publishing_authenticator_authenticated, self, 0);
+#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp3_ = self->priv->authenticator;
+#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_signal_connect_object (_tmp3_, "authentication-failed", (GCallback) _publishing_facebook_facebook_publisher_on_authenticator_failed_spit_publishing_authenticator_authentication_failed, self, 0);
+#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp4_ = self->priv->authenticator;
+#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	spit_publishing_authenticator_authenticate (_tmp4_);
+#line 4233 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_real_stop (SpitPublishingPublisher* base) {
 	PublishingFacebookFacebookPublisher * self;
 	PublishingFacebookGraphSession* _tmp0_ = NULL;
-#line 799 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_TYPE_FACEBOOK_PUBLISHER, PublishingFacebookFacebookPublisher);
-#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:800: FacebookPublisher: stop( ) invoked.");
-#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:688: FacebookPublisher: stop( ) invoked.");
+#line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->graph_session;
-#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp0_ != NULL) {
-#line 5171 "FacebookPublishing.c"
+#line 4248 "FacebookPublishing.c"
 		PublishingFacebookGraphSession* _tmp1_ = NULL;
-#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 691 "/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"
+#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_session_stop_transactions (_tmp1_);
-#line 5177 "FacebookPublishing.c"
+#line 4254 "FacebookPublishing.c"
 	}
-#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->host = NULL;
-#line 806 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->running = FALSE;
-#line 5183 "FacebookPublishing.c"
+#line 4260 "FacebookPublishing.c"
 }
 
 
@@ -5221,98 +4284,98 @@ static gboolean publishing_facebook_facebook_publisher_real_is_running (SpitPubl
 	PublishingFacebookFacebookPublisher * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_TYPE_FACEBOOK_PUBLISHER, PublishingFacebookFacebookPublisher);
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->running;
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp0_;
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 5199 "FacebookPublishing.c"
+#line 4276 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_class_init (PublishingFacebookFacebookPublisherClass * klass) {
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_parent_class = g_type_class_peek_parent (klass);
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFacebookFacebookPublisherPrivate));
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_facebook_facebook_publisher_finalize;
-#line 5210 "FacebookPublishing.c"
+#line 4287 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface) {
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface);
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	iface->get_service = (SpitPublishingService* (*)(SpitPublishingPublisher*)) publishing_facebook_facebook_publisher_real_get_service;
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	iface->start = (void (*)(SpitPublishingPublisher*)) publishing_facebook_facebook_publisher_real_start;
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_facebook_facebook_publisher_real_stop;
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	iface->is_running = (gboolean (*)(SpitPublishingPublisher*)) publishing_facebook_facebook_publisher_real_is_running;
-#line 5225 "FacebookPublishing.c"
+#line 4302 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_instance_init (PublishingFacebookFacebookPublisher * self) {
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv = PUBLISHING_FACEBOOK_FACEBOOK_PUBLISHER_GET_PRIVATE (self);
-#line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->host = NULL;
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->web_auth_pane = NULL;
-#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->progress_reporter = NULL;
-#line 179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->service = NULL;
-#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	self->priv->authenticator = NULL;
+#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->running = FALSE;
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->publishing_options_pane = NULL;
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->uploader = NULL;
-#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->uid = NULL;
-#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->username = NULL;
-#line 5250 "FacebookPublishing.c"
+#line 4327 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_finalize (GObject* obj) {
 	PublishingFacebookFacebookPublisher * self;
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_FACEBOOK_PUBLISHER, PublishingFacebookFacebookPublisher);
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_publishing_parameters_unref0 (self->priv->publishing_params);
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_object_unref0 (self->priv->web_auth_pane);
-#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
-#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->progress_reporter = NULL;
-#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->progress_reporter_target = NULL;
-#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_g_object_unref0 (self->priv->authenticator);
+#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_session_unref0 (self->priv->graph_session);
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->publishing_options_pane);
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_uploader_unref0 (self->priv->uploader);
-#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->priv->uid);
-#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->priv->username);
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_OBJECT_CLASS (publishing_facebook_facebook_publisher_parent_class)->finalize (obj);
-#line 5282 "FacebookPublishing.c"
+#line 4359 "FacebookPublishing.c"
 }
 
 
@@ -5330,1162 +4393,63 @@ GType publishing_facebook_facebook_publisher_get_type (void) {
 }
 
 
-PublishingFacebookWebAuthenticationPane* publishing_facebook_web_authentication_pane_construct (GType object_type) {
-	PublishingFacebookWebAuthenticationPane * self = NULL;
-	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 5314 "FacebookPublishing.c"
-}
-
-
-PublishingFacebookWebAuthenticationPane* publishing_facebook_web_authentication_pane_new (void) {
-#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 5321 "FacebookPublishing.c"
-}
-
-
-static gpointer _publishing_facebook_web_authentication_pane_locale_lookup_ref0 (gpointer self) {
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	return self ? publishing_facebook_web_authentication_pane_locale_lookup_ref (self) : NULL;
-#line 5328 "FacebookPublishing.c"
-}
-
-
-static gboolean string_contains (const gchar* self, const gchar* needle) {
-	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	return result;
-#line 5348 "FacebookPublishing.c"
-}
-
-
-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;
-	gboolean _tmp1_ = FALSE;
-	const gchar* _tmp2_ = NULL;
-	gchar* system_locale = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar** _tmp6_ = NULL;
-	gchar** _tmp7_ = NULL;
-	gchar** _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
-	const gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup** _tmp12_ = NULL;
-	gint _tmp12__length1 = 0;
-	gchar* _tmp43_ = NULL;
-#line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = setlocale (LC_ALL, "");
-#line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	raw_system_locale = _tmp0_;
-#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = raw_system_locale;
-#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp2_ == NULL) {
-#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp1_ = TRUE;
-#line 5380 "FacebookPublishing.c"
-	} else {
-		const gchar* _tmp3_ = NULL;
-#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp3_ = raw_system_locale;
-#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp1_ = g_strcmp0 (_tmp3_, "") == 0;
-#line 5387 "FacebookPublishing.c"
-	}
-#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp1_) {
-#line 5391 "FacebookPublishing.c"
-		gchar* _tmp4_ = NULL;
-#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp4_ = g_strdup ("www");
-#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		result = _tmp4_;
-#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		return result;
-#line 5399 "FacebookPublishing.c"
-	}
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = raw_system_locale;
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp7_ = _tmp6_ = g_strsplit (_tmp5_, ".", 0);
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp8_ = _tmp7_;
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp8__length1 = _vala_array_length (_tmp6_);
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp9_ = _tmp8_[0];
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp10_ = g_strdup (_tmp9_);
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp11_ = _tmp10_;
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp8_ = (_vala_array_free (_tmp8_, _tmp8__length1, (GDestroyNotify) g_free), NULL);
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	system_locale = _tmp11_;
-#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 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		locale_lookup_collection = _tmp12_;
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		locale_lookup_collection_length1 = _tmp12__length1;
-#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 5435 "FacebookPublishing.c"
-			PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp13_ = NULL;
-			PublishingFacebookWebAuthenticationPaneLocaleLookup* locale_lookup = NULL;
-#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 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			locale_lookup = _tmp13_;
-#line 5442 "FacebookPublishing.c"
-			{
-				const gchar* _tmp14_ = NULL;
-				PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp15_ = NULL;
-				const gchar* _tmp16_ = NULL;
-				gboolean _tmp17_ = FALSE;
-				PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp18_ = NULL;
-				const gchar* _tmp19_ = NULL;
-				PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp29_ = NULL;
-				const gchar* _tmp30_ = NULL;
-				PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp40_ = NULL;
-				const gchar* _tmp41_ = NULL;
-				gchar* _tmp42_ = NULL;
-#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp14_ = system_locale;
-#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp15_ = locale_lookup;
-#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp16_ = _tmp15_->prefix;
-#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp17_ = g_str_has_prefix (_tmp14_, _tmp16_);
-#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				if (!_tmp17_) {
-#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_publishing_facebook_web_authentication_pane_locale_lookup_unref0 (locale_lookup);
-#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					continue;
-#line 5469 "FacebookPublishing.c"
-				}
-#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp18_ = locale_lookup;
-#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp19_ = _tmp18_->exception_code;
-#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				if (_tmp19_ != NULL) {
-#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 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp20_ = locale_lookup;
-#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp21_ = _tmp20_->exception_translation;
-#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_vala_assert (_tmp21_ != NULL, "locale_lookup.exception_translation != null");
-#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp22_ = system_locale;
-#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp23_ = locale_lookup;
-#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp24_ = _tmp23_->exception_code;
-#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp25_ = string_contains (_tmp22_, _tmp24_);
-#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					if (_tmp25_) {
-#line 5500 "FacebookPublishing.c"
-						PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp26_ = NULL;
-						const gchar* _tmp27_ = NULL;
-						gchar* _tmp28_ = NULL;
-#line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-						_tmp26_ = locale_lookup;
-#line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-						_tmp27_ = _tmp26_->exception_translation;
-#line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-						_tmp28_ = g_strdup (_tmp27_);
-#line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-						result = _tmp28_;
-#line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-						_publishing_facebook_web_authentication_pane_locale_lookup_unref0 (locale_lookup);
-#line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-						_g_free0 (system_locale);
-#line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-						return result;
-#line 5518 "FacebookPublishing.c"
-					}
-				}
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp29_ = locale_lookup;
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp30_ = _tmp29_->exception_code_2;
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				if (_tmp30_ != NULL) {
-#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 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp31_ = locale_lookup;
-#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp32_ = _tmp31_->exception_translation_2;
-#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_vala_assert (_tmp32_ != NULL, "locale_lookup.exception_translation_2 != null");
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp33_ = system_locale;
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp34_ = locale_lookup;
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp35_ = _tmp34_->exception_code_2;
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp36_ = string_contains (_tmp33_, _tmp35_);
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					if (_tmp36_) {
-#line 5550 "FacebookPublishing.c"
-						PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp37_ = NULL;
-						const gchar* _tmp38_ = NULL;
-						gchar* _tmp39_ = NULL;
-#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-						_tmp37_ = locale_lookup;
-#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-						_tmp38_ = _tmp37_->exception_translation_2;
-#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-						_tmp39_ = g_strdup (_tmp38_);
-#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-						result = _tmp39_;
-#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-						_publishing_facebook_web_authentication_pane_locale_lookup_unref0 (locale_lookup);
-#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-						_g_free0 (system_locale);
-#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-						return result;
-#line 5568 "FacebookPublishing.c"
-					}
-				}
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp40_ = locale_lookup;
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp41_ = _tmp40_->translation;
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp42_ = g_strdup (_tmp41_);
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				result = _tmp42_;
-#line 918 "/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"
-				_g_free0 (system_locale);
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				return result;
-#line 5585 "FacebookPublishing.c"
-			}
-		}
-	}
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp43_ = g_strdup ("www");
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	result = _tmp43_;
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (system_locale);
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	return result;
-#line 5597 "FacebookPublishing.c"
-}
-
-
-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 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 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 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	result = _tmp1_;
-#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (facebook_locale);
-#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	return result;
-#line 5618 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base) {
-	PublishingFacebookWebAuthenticationPane * self;
-	gchar* loaded_url = NULL;
-	WebKitWebView* _tmp0_ = NULL;
-	WebKitWebView* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	gboolean _tmp10_ = FALSE;
-	const gchar* _tmp22_ = NULL;
-	gboolean _tmp23_ = FALSE;
-	const gchar* _tmp28_ = NULL;
-	gboolean _tmp29_ = FALSE;
-#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 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;
-		const gchar* _tmp15_ = NULL;
-		gint _tmp16_ = 0;
-		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 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 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 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 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;
-#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		publishing_facebook_web_authentication_pane_cache_dirty = TRUE;
-#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 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		return;
-#line 5751 "FacebookPublishing.c"
-	}
-#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 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_g_free0 (loaded_url);
-#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		return;
-#line 5765 "FacebookPublishing.c"
-	}
-#line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (loaded_url);
-#line 5769 "FacebookPublishing.c"
-}
-
-
-gboolean publishing_facebook_web_authentication_pane_is_cache_dirty (void) {
-	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = publishing_facebook_web_authentication_pane_cache_dirty;
-#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	result = _tmp0_;
-#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	return result;
-#line 5782 "FacebookPublishing.c"
-}
-
-
-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) {
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	const gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-#line 832 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_val_if_fail (prefix != NULL, NULL);
-#line 832 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_val_if_fail (translation != NULL, NULL);
-#line 832 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self = (PublishingFacebookWebAuthenticationPaneLocaleLookup*) g_type_create_instance (object_type);
-#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = prefix;
-#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (self->prefix);
-#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->prefix = _tmp1_;
-#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = translation;
-#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp3_ = g_strdup (_tmp2_);
-#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (self->translation);
-#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->translation = _tmp3_;
-#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp4_ = exception_code;
-#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = g_strdup (_tmp4_);
-#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (self->exception_code);
-#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->exception_code = _tmp5_;
-#line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp6_ = exception_translation;
-#line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp7_ = g_strdup (_tmp6_);
-#line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (self->exception_translation);
-#line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->exception_translation = _tmp7_;
-#line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp8_ = exception_code_2;
-#line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp9_ = g_strdup (_tmp8_);
-#line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (self->exception_code_2);
-#line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->exception_code_2 = _tmp9_;
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp10_ = exception_translation_2;
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp11_ = g_strdup (_tmp10_);
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (self->exception_translation_2);
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->exception_translation_2 = _tmp11_;
-#line 832 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	return self;
-#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 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 5863 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_web_authentication_pane_value_locale_lookup_init (GValue* value) {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	value->data[0].v_pointer = NULL;
-#line 5870 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_web_authentication_pane_value_locale_lookup_free_value (GValue* value) {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (value->data[0].v_pointer) {
-#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 5879 "FacebookPublishing.c"
-	}
-}
-
-
-static void publishing_facebook_web_authentication_pane_value_locale_lookup_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (src_value->data[0].v_pointer) {
-#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 5889 "FacebookPublishing.c"
-	} else {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 5893 "FacebookPublishing.c"
-	}
-}
-
-
-static gpointer publishing_facebook_web_authentication_pane_value_locale_lookup_peek_pointer (const GValue* value) {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	return value->data[0].v_pointer;
-#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 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (collect_values[0].v_pointer) {
-#line 5908 "FacebookPublishing.c"
-		PublishingFacebookWebAuthenticationPaneLocaleLookup* object;
-		object = collect_values[0].v_pointer;
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		if (object->parent_instance.g_class == NULL) {
-#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 5915 "FacebookPublishing.c"
-		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#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 5919 "FacebookPublishing.c"
-		}
-#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 5923 "FacebookPublishing.c"
-	} else {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		value->data[0].v_pointer = NULL;
-#line 5927 "FacebookPublishing.c"
-	}
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	return NULL;
-#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 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (!object_p) {
-#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 5942 "FacebookPublishing.c"
-	}
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (!value->data[0].v_pointer) {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		*object_p = NULL;
-#line 5948 "FacebookPublishing.c"
-	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		*object_p = value->data[0].v_pointer;
-#line 5952 "FacebookPublishing.c"
-	} else {
-#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 5956 "FacebookPublishing.c"
-	}
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	return NULL;
-#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 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 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	return G_PARAM_SPEC (spec);
-#line 5974 "FacebookPublishing.c"
-}
-
-
-static gpointer publishing_facebook_web_authentication_pane_value_get_locale_lookup (const GValue* value) {
-#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 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	return value->data[0].v_pointer;
-#line 5983 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_web_authentication_pane_value_set_locale_lookup (GValue* value, gpointer v_object) {
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* old;
-#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 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	old = value->data[0].v_pointer;
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (v_object) {
-#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 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 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		value->data[0].v_pointer = v_object;
-#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 6003 "FacebookPublishing.c"
-	} else {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		value->data[0].v_pointer = NULL;
-#line 6007 "FacebookPublishing.c"
-	}
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (old) {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		publishing_facebook_web_authentication_pane_locale_lookup_unref (old);
-#line 6013 "FacebookPublishing.c"
-	}
-}
-
-
-static void publishing_facebook_web_authentication_pane_value_take_locale_lookup (GValue* value, gpointer v_object) {
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* old;
-#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 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	old = value->data[0].v_pointer;
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (v_object) {
-#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 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 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		value->data[0].v_pointer = v_object;
-#line 6032 "FacebookPublishing.c"
-	} else {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		value->data[0].v_pointer = NULL;
-#line 6036 "FacebookPublishing.c"
-	}
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (old) {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		publishing_facebook_web_authentication_pane_locale_lookup_unref (old);
-#line 6042 "FacebookPublishing.c"
-	}
-}
-
-
-static void publishing_facebook_web_authentication_pane_locale_lookup_class_init (PublishingFacebookWebAuthenticationPaneLocaleLookupClass * klass) {
-#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 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	((PublishingFacebookWebAuthenticationPaneLocaleLookupClass *) klass)->finalize = publishing_facebook_web_authentication_pane_locale_lookup_finalize;
-#line 6052 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_web_authentication_pane_locale_lookup_instance_init (PublishingFacebookWebAuthenticationPaneLocaleLookup * self) {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->ref_count = 1;
-#line 6059 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_web_authentication_pane_locale_lookup_finalize (PublishingFacebookWebAuthenticationPaneLocaleLookup* obj) {
-	PublishingFacebookWebAuthenticationPaneLocaleLookup * self;
-#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 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_handlers_destroy (self);
-#line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (self->prefix);
-#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (self->translation);
-#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (self->exception_code);
-#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (self->exception_translation);
-#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (self->exception_code_2);
-#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (self->exception_translation_2);
-#line 6081 "FacebookPublishing.c"
-}
-
-
-static GType publishing_facebook_web_authentication_pane_locale_lookup_get_type (void) {
-	static volatile gsize publishing_facebook_web_authentication_pane_locale_lookup_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_facebook_web_authentication_pane_locale_lookup_type_id__volatile)) {
-		static const GTypeValueTable g_define_type_value_table = { publishing_facebook_web_authentication_pane_value_locale_lookup_init, publishing_facebook_web_authentication_pane_value_locale_lookup_free_value, publishing_facebook_web_authentication_pane_value_locale_lookup_copy_value, publishing_facebook_web_authentication_pane_value_locale_lookup_peek_pointer, "p", publishing_facebook_web_authentication_pane_value_locale_lookup_collect_value, "p", publishing_facebook_web_authentication_pane_value_locale_lookup_lcopy_value };
-		static const GTypeInfo g_define_type_info = { sizeof (PublishingFacebookWebAuthenticationPaneLocaleLookupClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_facebook_web_authentication_pane_locale_lookup_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFacebookWebAuthenticationPaneLocaleLookup), 0, (GInstanceInitFunc) publishing_facebook_web_authentication_pane_locale_lookup_instance_init, &g_define_type_value_table };
-		static const GTypeFundamentalInfo g_define_type_fundamental_info = { (G_TYPE_FLAG_CLASSED | G_TYPE_FLAG_INSTANTIATABLE | G_TYPE_FLAG_DERIVABLE | G_TYPE_FLAG_DEEP_DERIVABLE) };
-		GType publishing_facebook_web_authentication_pane_locale_lookup_type_id;
-		publishing_facebook_web_authentication_pane_locale_lookup_type_id = g_type_register_fundamental (g_type_fundamental_next (), "PublishingFacebookWebAuthenticationPaneLocaleLookup", &g_define_type_info, &g_define_type_fundamental_info, 0);
-		g_once_init_leave (&publishing_facebook_web_authentication_pane_locale_lookup_type_id__volatile, publishing_facebook_web_authentication_pane_locale_lookup_type_id);
-	}
-	return publishing_facebook_web_authentication_pane_locale_lookup_type_id__volatile;
-}
-
-
-static gpointer publishing_facebook_web_authentication_pane_locale_lookup_ref (gpointer instance) {
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* self;
-	self = instance;
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_atomic_int_inc (&self->ref_count);
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	return instance;
-#line 6106 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_web_authentication_pane_locale_lookup_unref (gpointer instance) {
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* self;
-	self = instance;
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_LOCALE_LOOKUP_GET_CLASS (self)->finalize (self);
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		g_type_free_instance ((GTypeInstance *) self);
-#line 6119 "FacebookPublishing.c"
-	}
-}
-
-
-static void publishing_facebook_web_authentication_pane_class_init (PublishingFacebookWebAuthenticationPaneClass * klass) {
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp0_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp1_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp2_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp3_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp4_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp5_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp6_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp7_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp8_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp9_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp10_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp11_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp12_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp13_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp14_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp15_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp16_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp17_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp18_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp19_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp20_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp21_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp22_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp23_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp24_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp25_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp26_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp27_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp28_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp29_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp30_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp31_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp32_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp33_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp34_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp35_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp36_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp37_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp38_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp39_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp40_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp41_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp42_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp43_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp44_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup** _tmp45_ = NULL;
-#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"
-	((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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_ = g_new0 (PublishingFacebookWebAuthenticationPaneLocaleLookup*, 45 + 1);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[0] = _tmp0_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[1] = _tmp1_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[2] = _tmp2_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[3] = _tmp3_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[4] = _tmp4_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[5] = _tmp5_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[6] = _tmp6_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[7] = _tmp7_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[8] = _tmp8_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[9] = _tmp9_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[10] = _tmp10_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[11] = _tmp11_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[12] = _tmp12_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[13] = _tmp13_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[14] = _tmp14_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[15] = _tmp15_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[16] = _tmp16_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[17] = _tmp17_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[18] = _tmp18_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[19] = _tmp19_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[20] = _tmp20_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[21] = _tmp21_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[22] = _tmp22_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[23] = _tmp23_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[24] = _tmp24_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[25] = _tmp25_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[26] = _tmp26_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[27] = _tmp27_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[28] = _tmp28_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[29] = _tmp29_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[30] = _tmp30_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[31] = _tmp31_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[32] = _tmp32_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[33] = _tmp33_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[34] = _tmp34_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[35] = _tmp35_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[36] = _tmp36_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[37] = _tmp37_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[38] = _tmp38_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[39] = _tmp39_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[40] = _tmp40_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[41] = _tmp41_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[42] = _tmp42_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[43] = _tmp43_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[44] = _tmp44_;
-#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) {
-}
-
-
-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 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	G_OBJECT_CLASS (publishing_facebook_web_authentication_pane_parent_class)->finalize (obj);
-#line 6381 "FacebookPublishing.c"
-}
-
-
-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 };
-		GType publishing_facebook_web_authentication_pane_type_id;
-		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;
-}
-
-
 static PublishingFacebookAlbum** _vala_array_dup2 (PublishingFacebookAlbum** self, int length) {
 	PublishingFacebookAlbum** result;
 	int i;
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = g_new0 (PublishingFacebookAlbum*, length + 1);
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 6404 "FacebookPublishing.c"
+#line 4384 "FacebookPublishing.c"
 		PublishingFacebookAlbum* _tmp0_ = NULL;
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = _publishing_facebook_album_ref0 (self[i]);
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		result[i] = _tmp0_;
-#line 6410 "FacebookPublishing.c"
+#line 4390 "FacebookPublishing.c"
 	}
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 6414 "FacebookPublishing.c"
+#line 4394 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_publishing_options_pane_on_create_new_toggled_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_on_create_new_toggled ((PublishingFacebookPublishingOptionsPane*) self);
-#line 6421 "FacebookPublishing.c"
+#line 4401 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_publishing_options_pane_on_use_existing_toggled_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_on_use_existing_toggled ((PublishingFacebookPublishingOptionsPane*) self);
-#line 6428 "FacebookPublishing.c"
+#line 4408 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_publishing_options_pane_on_publish_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_on_publish_button_clicked ((PublishingFacebookPublishingOptionsPane*) self);
-#line 6435 "FacebookPublishing.c"
+#line 4415 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_publishing_options_pane_on_logout_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_on_logout_button_clicked ((PublishingFacebookPublishingOptionsPane*) self);
-#line 6442 "FacebookPublishing.c"
+#line 4422 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_on_size_changed ((PublishingFacebookPublishingOptionsPane*) self);
-#line 6449 "FacebookPublishing.c"
+#line 4429 "FacebookPublishing.c"
 }
 
 
-PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_pane_construct (GType object_type, const gchar* username, PublishingFacebookAlbum** albums, int albums_length1, SpitPublishingPublisherMediaType media_type, PublishingFacebookFacebookPublisher* publisher, GtkBuilder* builder, gboolean strip_metadata) {
+PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_pane_construct (GType object_type, const gchar* username, PublishingFacebookAlbum** albums, int albums_length1, SpitPublishingPublisherMediaType media_type, PublishingFacebookFacebookPublisher* publisher, GtkBuilder* builder, gboolean strip_metadata, gboolean can_logout) {
 	PublishingFacebookPublishingOptionsPane * self = NULL;
 	GtkBuilder* _tmp0_ = NULL;
 	GtkBuilder* _tmp1_ = NULL;
@@ -6527,467 +4491,489 @@ PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_
 	GtkBuilder* _tmp35_ = NULL;
 	GObject* _tmp36_ = NULL;
 	GtkButton* _tmp37_ = NULL;
-	GtkBuilder* _tmp38_ = NULL;
-	GObject* _tmp39_ = NULL;
-	GtkEntry* _tmp40_ = NULL;
-	GtkBuilder* _tmp41_ = NULL;
-	GObject* _tmp42_ = NULL;
-	GtkComboBoxText* _tmp43_ = NULL;
-	GtkBuilder* _tmp44_ = NULL;
-	GObject* _tmp45_ = NULL;
-	GtkLabel* _tmp46_ = NULL;
-	GtkBuilder* _tmp47_ = NULL;
-	GObject* _tmp48_ = NULL;
-	GtkCheckButton* _tmp49_ = NULL;
-	GtkRadioButton* _tmp50_ = NULL;
-	GtkRadioButton* _tmp51_ = NULL;
+	gboolean _tmp38_ = FALSE;
+	GtkBuilder* _tmp43_ = NULL;
+	GObject* _tmp44_ = NULL;
+	GtkEntry* _tmp45_ = NULL;
+	GtkBuilder* _tmp46_ = NULL;
+	GObject* _tmp47_ = NULL;
+	GtkComboBoxText* _tmp48_ = NULL;
+	GtkBuilder* _tmp49_ = NULL;
+	GObject* _tmp50_ = NULL;
+	GtkLabel* _tmp51_ = NULL;
+	GtkBuilder* _tmp52_ = NULL;
+	GObject* _tmp53_ = NULL;
+	GtkCheckButton* _tmp54_ = NULL;
+	GtkRadioButton* _tmp55_ = NULL;
+	GtkRadioButton* _tmp56_ = NULL;
 	gchar* label_text = NULL;
-	const gchar* _tmp52_ = NULL;
-	gchar* _tmp53_ = NULL;
-	SpitPublishingPublisherMediaType _tmp54_ = 0;
-	GtkLabel* _tmp57_ = NULL;
-	const gchar* _tmp58_ = NULL;
-	GtkCheckButton* _tmp59_ = NULL;
-	gboolean _tmp60_ = FALSE;
-	GtkComboBoxText* _tmp61_ = NULL;
-	GtkButton* _tmp62_ = NULL;
-	GtkButton* _tmp63_ = NULL;
-	GtkComboBoxText* _tmp64_ = NULL;
-	PublishingFacebookFacebookPublisher* _tmp65_ = NULL;
-	gint _tmp66_ = 0;
-	GtkComboBoxText* _tmp67_ = NULL;
-	gboolean _tmp68_ = FALSE;
-	gboolean _tmp69_ = FALSE;
-	GtkRadioButton* _tmp70_ = NULL;
-	GtkComboBoxText* _tmp75_ = NULL;
-	SpitPublishingPublisherMediaType _tmp76_ = 0;
-#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	const gchar* _tmp57_ = NULL;
+	gchar* _tmp58_ = NULL;
+	SpitPublishingPublisherMediaType _tmp59_ = 0;
+	GtkLabel* _tmp62_ = NULL;
+	const gchar* _tmp63_ = NULL;
+	GtkCheckButton* _tmp64_ = NULL;
+	gboolean _tmp65_ = FALSE;
+	GtkComboBoxText* _tmp66_ = NULL;
+	GtkButton* _tmp67_ = NULL;
+	GtkButton* _tmp68_ = NULL;
+	GtkComboBoxText* _tmp69_ = NULL;
+	PublishingFacebookFacebookPublisher* _tmp70_ = NULL;
+	gint _tmp71_ = 0;
+	GtkComboBoxText* _tmp72_ = NULL;
+	gboolean _tmp73_ = FALSE;
+	gboolean _tmp74_ = FALSE;
+	GtkRadioButton* _tmp75_ = NULL;
+	GtkComboBoxText* _tmp80_ = NULL;
+	SpitPublishingPublisherMediaType _tmp81_ = 0;
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (username != NULL, NULL);
-#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (publisher), NULL);
-#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (GTK_IS_BUILDER (builder), NULL);
-#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = (PublishingFacebookPublishingOptionsPane*) g_object_new (object_type, NULL);
-#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = builder;
-#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->builder = _tmp1_;
-#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = builder;
-#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_assert (_tmp2_ != NULL, "builder != null");
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = builder;
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = gtk_builder_get_objects (_tmp3_);
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = _tmp4_;
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = g_slist_length (_tmp5_);
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_assert (_tmp6_ > ((guint) 0), "builder.get_objects().length() > 0");
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_slist_free0 (_tmp5_);
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = albums;
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7__length1 = albums_length1;
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup2 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_);
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8__length1 = _tmp7__length1;
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 751 "/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 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->albums = _tmp8_;
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->albums_length1 = _tmp8__length1;
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->_albums_size_ = self->priv->albums_length1;
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = publishing_facebook_publishing_options_pane_create_privacy_descriptions (self, &_tmp9_);
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 752 "/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 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->privacy_descriptions = _tmp10_;
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->privacy_descriptions_length1 = _tmp9_;
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->_privacy_descriptions_size_ = self->priv->privacy_descriptions_length1;
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp12_ = publishing_facebook_publishing_options_pane_create_resolution_list (self, &_tmp11_);
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->possible_resolutions = (g_free (self->priv->possible_resolutions), NULL);
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->possible_resolutions = _tmp12_;
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->possible_resolutions_length1 = _tmp11_;
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->_possible_resolutions_size_ = self->priv->possible_resolutions_length1;
-#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp13_ = publisher;
-#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp14_ = _g_object_ref0 (_tmp13_);
-#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->publisher);
-#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->publisher = _tmp14_;
-#line 1017 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp15_ = media_type;
-#line 1017 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->media_type = _tmp15_;
-#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp16_ = builder;
-#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp17_ = gtk_builder_get_object (_tmp16_, "facebook_pane_box");
-#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 760 "/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 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->pane_widget);
-#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->pane_widget = _tmp18_;
-#line 1020 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp19_ = self->priv->pane_widget;
-#line 1020 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 761 "/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 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp20_ = self->priv->builder;
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp21_ = gtk_builder_get_object (_tmp20_, "use_existing_radio");
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 763 "/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 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->use_existing_radio);
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->use_existing_radio = _tmp22_;
-#line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp23_ = self->priv->builder;
-#line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp24_ = gtk_builder_get_object (_tmp23_, "create_new_radio");
-#line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 764 "/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 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->create_new_radio);
-#line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->create_new_radio = _tmp25_;
-#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp26_ = self->priv->builder;
-#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp27_ = gtk_builder_get_object (_tmp26_, "existing_albums_combo");
-#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 765 "/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 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->existing_albums_combo);
-#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->existing_albums_combo = _tmp28_;
-#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp29_ = self->priv->builder;
-#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp30_ = gtk_builder_get_object (_tmp29_, "visibility_combo");
-#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 766 "/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 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->visibility_combo);
-#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->visibility_combo = _tmp31_;
-#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp32_ = self->priv->builder;
-#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp33_ = gtk_builder_get_object (_tmp32_, "publish_button");
-#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 767 "/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 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->publish_button);
-#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->publish_button = _tmp34_;
-#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp35_ = self->priv->builder;
-#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp36_ = gtk_builder_get_object (_tmp35_, "logout_button");
-#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 768 "/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 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->logout_button);
-#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->logout_button = _tmp37_;
-#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp38_ = self->priv->builder;
-#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp39_ = gtk_builder_get_object (_tmp38_, "new_album_entry");
-#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 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp38_ = can_logout;
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	if (!_tmp38_) {
+#line 4668 "FacebookPublishing.c"
+		GtkButton* _tmp39_ = NULL;
+		GtkContainer* _tmp40_ = NULL;
+		GtkContainer* _tmp41_ = NULL;
+		GtkButton* _tmp42_ = NULL;
+#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp39_ = self->priv->logout_button;
+#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp40_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget));
+#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp41_ = _tmp40_;
+#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp42_ = self->priv->logout_button;
+#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		gtk_container_remove (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget));
+#line 4683 "FacebookPublishing.c"
+	}
+#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp43_ = self->priv->builder;
+#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp44_ = gtk_builder_get_object (_tmp43_, "new_album_entry");
+#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp45_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_entry_get_type (), GtkEntry));
+#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->new_album_entry);
-#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->new_album_entry = _tmp40_;
-#line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp41_ = self->priv->builder;
-#line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp42_ = gtk_builder_get_object (_tmp41_, "resolution_combo");
-#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 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	self->priv->new_album_entry = _tmp45_;
+#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp46_ = self->priv->builder;
+#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp47_ = gtk_builder_get_object (_tmp46_, "resolution_combo");
+#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp48_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_combo_box_text_get_type (), GtkComboBoxText));
+#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->resolution_combo);
-#line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->resolution_combo = _tmp43_;
-#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp44_ = self->priv->builder;
-#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_ = gtk_builder_get_object (_tmp44_, "how_to_label");
-#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 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	self->priv->resolution_combo = _tmp48_;
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp49_ = self->priv->builder;
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp50_ = gtk_builder_get_object (_tmp49_, "how_to_label");
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp51_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_label_get_type (), GtkLabel));
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->how_to_label);
-#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->how_to_label = _tmp46_;
-#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp47_ = self->priv->builder;
-#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp48_ = gtk_builder_get_object (_tmp47_, "strip_metadata_check");
-#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 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	self->priv->how_to_label = _tmp51_;
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp52_ = self->priv->builder;
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp53_ = gtk_builder_get_object (_tmp52_, "strip_metadata_check");
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp54_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_check_button_get_type (), GtkCheckButton));
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->strip_metadata_check);
-#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->strip_metadata_check = _tmp49_;
-#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp50_ = self->priv->create_new_radio;
-#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 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp51_ = self->priv->use_existing_radio;
-#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 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp52_ = username;
-#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 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	label_text = _tmp53_;
-#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp54_ = media_type;
-#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if ((_tmp54_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) {
-#line 6741 "FacebookPublishing.c"
-		const gchar* _tmp55_ = NULL;
-		gchar* _tmp56_ = NULL;
-#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp55_ = label_text;
-#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 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	self->priv->strip_metadata_check = _tmp54_;
+#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp55_ = self->priv->create_new_radio;
+#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_facebook_publishing_options_pane_on_create_new_toggled_gtk_button_clicked, self, 0);
+#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp56_ = self->priv->use_existing_radio;
+#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_facebook_publishing_options_pane_on_use_existing_toggled_gtk_button_clicked, self, 0);
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp57_ = username;
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp58_ = g_strdup_printf (PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_HEADER_LABEL_TEXT, _tmp57_);
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	label_text = _tmp58_;
+#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp59_ = media_type;
+#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	if ((_tmp59_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) {
+#line 4743 "FacebookPublishing.c"
+		const gchar* _tmp60_ = NULL;
+		gchar* _tmp61_ = NULL;
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp60_ = label_text;
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp61_ = g_strconcat (_tmp60_, PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_PHOTOS_LABEL_TEXT, NULL);
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (label_text);
-#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		label_text = _tmp56_;
-#line 6752 "FacebookPublishing.c"
-	}
-#line 1039 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp57_ = self->priv->how_to_label;
-#line 1039 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp58_ = label_text;
-#line 1039 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	gtk_label_set_label (_tmp57_, _tmp58_);
-#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp59_ = self->priv->strip_metadata_check;
-#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp60_ = strip_metadata;
-#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 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		label_text = _tmp61_;
+#line 4754 "FacebookPublishing.c"
+	}
+#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp62_ = self->priv->how_to_label;
+#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp63_ = label_text;
+#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	gtk_label_set_label (_tmp62_, _tmp63_);
+#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp64_ = self->priv->strip_metadata_check;
+#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp65_ = strip_metadata;
+#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp65_);
+#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_setup_visibility_combo (self);
-#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp61_ = self->priv->visibility_combo;
-#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 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp62_ = self->priv->publish_button;
-#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 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp63_ = self->priv->logout_button;
-#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 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp66_ = self->priv->visibility_combo;
+#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_combo_box_get_type (), GtkComboBox), 0);
+#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp67_ = self->priv->publish_button;
+#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_signal_connect_object (_tmp67_, "clicked", (GCallback) _publishing_facebook_publishing_options_pane_on_publish_button_clicked_gtk_button_clicked, self, 0);
+#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp68_ = self->priv->logout_button;
+#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_signal_connect_object (_tmp68_, "clicked", (GCallback) _publishing_facebook_publishing_options_pane_on_logout_button_clicked_gtk_button_clicked, self, 0);
+#line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_setup_resolution_combo (self);
-#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp64_ = self->priv->resolution_combo;
-#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp65_ = publisher;
-#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp66_ = publishing_facebook_facebook_publisher_get_persistent_default_size (_tmp65_);
-#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 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp67_ = self->priv->resolution_combo;
-#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 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp70_ = self->priv->create_new_radio;
-#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp70_ != NULL) {
-#line 6798 "FacebookPublishing.c"
-		GtkRadioButton* _tmp71_ = NULL;
-		gboolean _tmp72_ = FALSE;
-		gboolean _tmp73_ = FALSE;
-#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp71_ = self->priv->create_new_radio;
-#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 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp73_ = _tmp72_;
-#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp69_ = _tmp73_;
-#line 6810 "FacebookPublishing.c"
+#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp69_ = self->priv->resolution_combo;
+#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp70_ = publisher;
+#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp71_ = publishing_facebook_facebook_publisher_get_persistent_default_size (_tmp70_);
+#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_combo_box_get_type (), GtkComboBox), _tmp71_);
+#line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp72_ = self->priv->resolution_combo;
+#line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_facebook_publishing_options_pane_on_size_changed_gtk_combo_box_changed, self, 0);
+#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp75_ = self->priv->create_new_radio;
+#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	if (_tmp75_ != NULL) {
+#line 4800 "FacebookPublishing.c"
+		GtkRadioButton* _tmp76_ = NULL;
+		gboolean _tmp77_ = FALSE;
+		gboolean _tmp78_ = FALSE;
+#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp76_ = self->priv->create_new_radio;
+#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp77_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp78_ = _tmp77_;
+#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp74_ = _tmp78_;
+#line 4812 "FacebookPublishing.c"
 	} else {
-#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp69_ = FALSE;
-#line 6814 "FacebookPublishing.c"
+#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp74_ = FALSE;
+#line 4816 "FacebookPublishing.c"
 	}
-#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp69_) {
-#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp68_ = TRUE;
-#line 6820 "FacebookPublishing.c"
+#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	if (_tmp74_) {
+#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp73_ = TRUE;
+#line 4822 "FacebookPublishing.c"
 	} else {
-		SpitPublishingPublisherMediaType _tmp74_ = 0;
-#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp74_ = media_type;
-#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp68_ = (_tmp74_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) != 0;
-#line 6827 "FacebookPublishing.c"
-	}
-#line 1055 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp75_ = self->priv->visibility_combo;
-#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 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp76_ = media_type;
-#line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp76_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 6837 "FacebookPublishing.c"
-		GtkCheckButton* _tmp77_ = NULL;
-		GtkCheckButton* _tmp78_ = NULL;
-		GtkComboBoxText* _tmp79_ = NULL;
-		GtkRadioButton* _tmp80_ = NULL;
-		GtkRadioButton* _tmp81_ = NULL;
-		GtkComboBoxText* _tmp82_ = NULL;
-		GtkEntry* _tmp83_ = NULL;
-#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp77_ = self->priv->strip_metadata_check;
-#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 1062 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp78_ = self->priv->strip_metadata_check;
-#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 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp79_ = self->priv->resolution_combo;
-#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 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp80_ = self->priv->use_existing_radio;
-#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 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp81_ = self->priv->create_new_radio;
-#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 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp82_ = self->priv->existing_albums_combo;
-#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 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp83_ = self->priv->new_album_entry;
-#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 6873 "FacebookPublishing.c"
+		SpitPublishingPublisherMediaType _tmp79_ = 0;
+#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp79_ = media_type;
+#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp73_ = (_tmp79_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) != 0;
+#line 4829 "FacebookPublishing.c"
 	}
-#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 799 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp80_ = self->priv->visibility_combo;
+#line 799 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_widget_get_type (), GtkWidget), _tmp73_);
+#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp81_ = media_type;
+#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	if (_tmp81_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+#line 4839 "FacebookPublishing.c"
+		GtkCheckButton* _tmp82_ = NULL;
+		GtkCheckButton* _tmp83_ = NULL;
+		GtkComboBoxText* _tmp84_ = NULL;
+		GtkRadioButton* _tmp85_ = NULL;
+		GtkRadioButton* _tmp86_ = NULL;
+		GtkComboBoxText* _tmp87_ = NULL;
+		GtkEntry* _tmp88_ = NULL;
+#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp82_ = self->priv->strip_metadata_check;
+#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, gtk_toggle_button_get_type (), GtkToggleButton), FALSE);
+#line 806 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp83_ = self->priv->strip_metadata_check;
+#line 806 "/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 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp84_ = self->priv->resolution_combo;
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp85_ = self->priv->use_existing_radio;
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp86_ = self->priv->create_new_radio;
+#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp87_ = self->priv->existing_albums_combo;
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp88_ = self->priv->new_album_entry;
+#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 4875 "FacebookPublishing.c"
+	}
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (label_text);
-#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 6879 "FacebookPublishing.c"
+#line 4881 "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 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 6886 "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, gboolean can_logout) {
+#line 743 "/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, can_logout);
+#line 4888 "FacebookPublishing.c"
 }
 
 
 static gboolean publishing_facebook_publishing_options_pane_publishing_photos (PublishingFacebookPublishingOptionsPane* self) {
 	gboolean result = FALSE;
 	SpitPublishingPublisherMediaType _tmp0_ = 0;
-#line 1071 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 815 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self), FALSE);
-#line 1072 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->media_type;
-#line 1072 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = (_tmp0_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0;
-#line 1072 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 6901 "FacebookPublishing.c"
+#line 4903 "FacebookPublishing.c"
 }
 
 
 static gpointer _publishing_facebook_publishing_options_pane_privacy_description_ref0 (gpointer self) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? publishing_facebook_publishing_options_pane_privacy_description_ref (self) : NULL;
-#line 6908 "FacebookPublishing.c"
+#line 4910 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_setup_visibility_combo (PublishingFacebookPublishingOptionsPane* self) {
 	PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp0_ = NULL;
 	gint _tmp0__length1 = 0;
-#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->privacy_descriptions;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0__length1 = self->priv->privacy_descriptions_length1;
-#line 6921 "FacebookPublishing.c"
+#line 4923 "FacebookPublishing.c"
 	{
 		PublishingFacebookPublishingOptionsPanePrivacyDescription** p_collection = NULL;
 		gint p_collection_length1 = 0;
 		gint _p_collection_size_ = 0;
 		gint p_it = 0;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		p_collection = _tmp0_;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		p_collection_length1 = _tmp0__length1;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		for (p_it = 0; p_it < _tmp0__length1; p_it = p_it + 1) {
-#line 6933 "FacebookPublishing.c"
+#line 4935 "FacebookPublishing.c"
 			PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp1_ = NULL;
 			PublishingFacebookPublishingOptionsPanePrivacyDescription* p = NULL;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp1_ = _publishing_facebook_publishing_options_pane_privacy_description_ref0 (p_collection[p_it]);
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			p = _tmp1_;
-#line 6940 "FacebookPublishing.c"
+#line 4942 "FacebookPublishing.c"
 			{
 				GtkComboBoxText* _tmp2_ = NULL;
 				PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp3_ = NULL;
 				const gchar* _tmp4_ = NULL;
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp2_ = self->priv->visibility_combo;
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp3_ = p;
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp4_ = _tmp3_->description;
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				gtk_combo_box_text_append_text (_tmp2_, _tmp4_);
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_publishing_facebook_publishing_options_pane_privacy_description_unref0 (p);
-#line 6955 "FacebookPublishing.c"
+#line 4957 "FacebookPublishing.c"
 			}
 		}
 	}
@@ -6997,47 +4983,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 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->possible_resolutions;
-#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0__length1 = self->priv->possible_resolutions_length1;
-#line 6971 "FacebookPublishing.c"
+#line 4973 "FacebookPublishing.c"
 	{
 		PublishingFacebookResolution* res_collection = NULL;
 		gint res_collection_length1 = 0;
 		gint _res_collection_size_ = 0;
 		gint res_it = 0;
-#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		res_collection = _tmp0_;
-#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		res_collection_length1 = _tmp0__length1;
-#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		for (res_it = 0; res_it < _tmp0__length1; res_it = res_it + 1) {
-#line 6983 "FacebookPublishing.c"
+#line 4985 "FacebookPublishing.c"
 			PublishingFacebookResolution res = 0;
-#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			res = res_collection[res_it];
-#line 6987 "FacebookPublishing.c"
+#line 4989 "FacebookPublishing.c"
 			{
 				GtkComboBoxText* _tmp1_ = NULL;
 				PublishingFacebookResolution _tmp2_ = 0;
 				gchar* _tmp3_ = NULL;
 				gchar* _tmp4_ = NULL;
-#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp1_ = self->priv->resolution_combo;
-#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp2_ = res;
-#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp3_ = publishing_facebook_resolution_get_name (_tmp2_);
-#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp4_ = _tmp3_;
-#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				gtk_combo_box_text_append_text (_tmp1_, _tmp4_);
-#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_g_free0 (_tmp4_);
-#line 7005 "FacebookPublishing.c"
+#line 5007 "FacebookPublishing.c"
 			}
 		}
 	}
@@ -7048,41 +5034,41 @@ static void publishing_facebook_publishing_options_pane_on_use_existing_toggled
 	GtkRadioButton* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->use_existing_radio;
-#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 830 "/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 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = _tmp1_;
-#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp2_) {
-#line 7026 "FacebookPublishing.c"
+#line 5028 "FacebookPublishing.c"
 		GtkComboBoxText* _tmp3_ = NULL;
 		GtkEntry* _tmp4_ = NULL;
 		GtkComboBoxText* _tmp5_ = NULL;
 		SpitPublishingPublisherMediaType _tmp6_ = 0;
 		GtkComboBoxText* _tmp7_ = NULL;
-#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp3_ = self->priv->existing_albums_combo;
-#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 831 "/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 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 832 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp4_ = self->priv->new_album_entry;
-#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 832 "/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 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp5_ = self->priv->visibility_combo;
-#line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp6_ = self->priv->media_type;
-#line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 837 "/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 1095 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp7_ = self->priv->existing_albums_combo;
-#line 1095 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 839 "/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 7050 "FacebookPublishing.c"
+#line 5052 "FacebookPublishing.c"
 	}
 }
 
@@ -7091,38 +5077,38 @@ static void publishing_facebook_publishing_options_pane_on_create_new_toggled (P
 	GtkRadioButton* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->create_new_radio;
-#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 844 "/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 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = _tmp1_;
-#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp2_) {
-#line 7069 "FacebookPublishing.c"
+#line 5071 "FacebookPublishing.c"
 		GtkComboBoxText* _tmp3_ = NULL;
 		GtkEntry* _tmp4_ = NULL;
 		GtkEntry* _tmp5_ = NULL;
 		GtkComboBoxText* _tmp6_ = NULL;
-#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp3_ = self->priv->existing_albums_combo;
-#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/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 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp4_ = self->priv->new_album_entry;
-#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 846 "/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 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp5_ = self->priv->new_album_entry;
-#line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 847 "/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 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp6_ = self->priv->visibility_combo;
-#line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 851 "/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 7090 "FacebookPublishing.c"
+#line 5092 "FacebookPublishing.c"
 	}
 }
 
@@ -7131,26 +5117,26 @@ static void publishing_facebook_publishing_options_pane_on_size_changed (Publish
 	PublishingFacebookFacebookPublisher* _tmp0_ = NULL;
 	GtkComboBoxText* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
-#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->publisher;
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->resolution_combo;
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 856 "/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 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_set_persistent_default_size (_tmp0_, _tmp2_);
-#line 7109 "FacebookPublishing.c"
+#line 5111 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_on_logout_button_clicked (PublishingFacebookPublishingOptionsPane* self) {
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 859 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_emit_by_name (self, "logout");
-#line 7118 "FacebookPublishing.c"
+#line 5120 "FacebookPublishing.c"
 }
 
 
@@ -7171,29 +5157,29 @@ static void publishing_facebook_publishing_options_pane_on_publish_button_clicke
 	PublishingFacebookResolution _tmp21_ = 0;
 	GtkCheckButton* _tmp22_ = NULL;
 	gboolean _tmp23_ = FALSE;
-#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->privacy_descriptions;
-#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0__length1 = self->priv->privacy_descriptions_length1;
-#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->visibility_combo;
-#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 865 "/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 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = _tmp0_[_tmp2_];
-#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = _tmp3_->privacy_setting;
-#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = g_strdup (_tmp4_);
-#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	privacy_setting = _tmp5_;
-#line 1125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 869 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = publishing_facebook_publishing_options_pane_publishing_photos (self);
-#line 1125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 869 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp6_) {
-#line 7161 "FacebookPublishing.c"
+#line 5163 "FacebookPublishing.c"
 		PublishingFacebookResolution* _tmp7_ = NULL;
 		gint _tmp7__length1 = 0;
 		GtkComboBoxText* _tmp8_ = NULL;
@@ -7202,131 +5188,131 @@ static void publishing_facebook_publishing_options_pane_on_publish_button_clicke
 		GtkRadioButton* _tmp11_ = NULL;
 		gboolean _tmp12_ = FALSE;
 		gboolean _tmp13_ = FALSE;
-#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp7_ = self->priv->possible_resolutions;
-#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp7__length1 = self->priv->possible_resolutions_length1;
-#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp8_ = self->priv->resolution_combo;
-#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 870 "/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 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp10_ = _tmp7_[_tmp9_];
-#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		resolution_setting = _tmp10_;
-#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 871 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp11_ = self->priv->use_existing_radio;
-#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 871 "/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 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 871 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp13_ = _tmp12_;
-#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 871 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (_tmp13_) {
-#line 7190 "FacebookPublishing.c"
+#line 5192 "FacebookPublishing.c"
 			GtkComboBoxText* _tmp14_ = NULL;
 			gchar* _tmp15_ = NULL;
-#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp14_ = self->priv->existing_albums_combo;
-#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp15_ = gtk_combo_box_text_get_active_text (_tmp14_);
-#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_free0 (album_name);
-#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			album_name = _tmp15_;
-#line 7201 "FacebookPublishing.c"
+#line 5203 "FacebookPublishing.c"
 		} else {
 			GtkEntry* _tmp16_ = NULL;
 			const gchar* _tmp17_ = NULL;
 			gchar* _tmp18_ = NULL;
-#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp16_ = self->priv->new_album_entry;
-#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp17_ = gtk_entry_get_text (_tmp16_);
-#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp18_ = g_strdup (_tmp17_);
-#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_free0 (album_name);
-#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			album_name = _tmp18_;
-#line 7216 "FacebookPublishing.c"
+#line 5218 "FacebookPublishing.c"
 		}
 	} else {
-#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		resolution_setting = PUBLISHING_FACEBOOK_RESOLUTION_STANDARD;
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (album_name);
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		album_name = NULL;
-#line 7225 "FacebookPublishing.c"
+#line 5227 "FacebookPublishing.c"
 	}
-#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp19_ = album_name;
-#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp20_ = privacy_setting;
-#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp21_ = resolution_setting;
-#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp22_ = self->priv->strip_metadata_check;
-#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 881 "/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 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_emit_by_name (self, "publish", _tmp19_, _tmp20_, _tmp21_, _tmp23_);
-#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (privacy_setting);
-#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (album_name);
-#line 7243 "FacebookPublishing.c"
+#line 5245 "FacebookPublishing.c"
 }
 
 
 static void _vala_array_add7 (PublishingFacebookPublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value) {
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*array = g_renew (PublishingFacebookPublishingOptionsPanePrivacyDescription*, *array, (*size) + 1);
-#line 7254 "FacebookPublishing.c"
+#line 5256 "FacebookPublishing.c"
 	}
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[*length] = NULL;
-#line 7260 "FacebookPublishing.c"
+#line 5262 "FacebookPublishing.c"
 }
 
 
 static void _vala_array_add8 (PublishingFacebookPublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value) {
-#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*array = g_renew (PublishingFacebookPublishingOptionsPanePrivacyDescription*, *array, (*size) + 1);
-#line 7271 "FacebookPublishing.c"
+#line 5273 "FacebookPublishing.c"
 	}
-#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[*length] = NULL;
-#line 7277 "FacebookPublishing.c"
+#line 5279 "FacebookPublishing.c"
 }
 
 
 static void _vala_array_add9 (PublishingFacebookPublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value) {
-#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*array = g_renew (PublishingFacebookPublishingOptionsPanePrivacyDescription*, *array, (*size) + 1);
-#line 7288 "FacebookPublishing.c"
+#line 5290 "FacebookPublishing.c"
 	}
-#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[*length] = NULL;
-#line 7294 "FacebookPublishing.c"
+#line 5296 "FacebookPublishing.c"
 }
 
 
@@ -7350,91 +5336,91 @@ static PublishingFacebookPublishingOptionsPanePrivacyDescription** publishing_fa
 	PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp9_ = NULL;
 	PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp10_ = NULL;
 	gint _tmp10__length1 = 0;
-#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
-#line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = g_new0 (PublishingFacebookPublishingOptionsPanePrivacyDescription*, 0 + 1);
-#line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_result_ = _tmp0_;
-#line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_result__length1 = 0;
-#line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	__result__size_ = _result__length1;
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = _result_;
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1__length1 = _result__length1;
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = _ ("Just me");
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = publishing_facebook_publishing_options_pane_privacy_description_new (_tmp2_, "{ 'value' : 'SELF' }");
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_array_add7 (&_result_, &_result__length1, &__result__size_, _tmp3_);
-#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = _result_;
-#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4__length1 = _result__length1;
-#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = _ ("Friends");
-#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = publishing_facebook_publishing_options_pane_privacy_description_new (_tmp5_, "{ 'value' : 'ALL_FRIENDS' }");
-#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_array_add8 (&_result_, &_result__length1, &__result__size_, _tmp6_);
-#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = _result_;
-#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7__length1 = _result__length1;
-#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = _ ("Everyone");
-#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp9_ = publishing_facebook_publishing_options_pane_privacy_description_new (_tmp8_, "{ 'value' : 'EVERYONE' }");
-#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_array_add9 (&_result_, &_result__length1, &__result__size_, _tmp9_);
-#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = _result_;
-#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10__length1 = _result__length1;
-#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (result_length1) {
-#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*result_length1 = _tmp10__length1;
-#line 7366 "FacebookPublishing.c"
+#line 5368 "FacebookPublishing.c"
 	}
-#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp10_;
-#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 7372 "FacebookPublishing.c"
+#line 5374 "FacebookPublishing.c"
 }
 
 
 static void _vala_array_add10 (PublishingFacebookResolution** array, int* length, int* size, PublishingFacebookResolution value) {
-#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*array = g_renew (PublishingFacebookResolution, *array, *size);
-#line 7383 "FacebookPublishing.c"
+#line 5385 "FacebookPublishing.c"
 	}
-#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 7387 "FacebookPublishing.c"
+#line 5389 "FacebookPublishing.c"
 }
 
 
 static void _vala_array_add11 (PublishingFacebookResolution** array, int* length, int* size, PublishingFacebookResolution value) {
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*array = g_renew (PublishingFacebookResolution, *array, *size);
-#line 7398 "FacebookPublishing.c"
+#line 5400 "FacebookPublishing.c"
 	}
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 7402 "FacebookPublishing.c"
+#line 5404 "FacebookPublishing.c"
 }
 
 
@@ -7450,120 +5436,120 @@ static PublishingFacebookResolution* publishing_facebook_publishing_options_pane
 	gint _tmp2__length1 = 0;
 	PublishingFacebookResolution* _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
-#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
-#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = g_new0 (PublishingFacebookResolution, 0);
-#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_result_ = _tmp0_;
-#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_result__length1 = 0;
-#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	__result__size_ = _result__length1;
-#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = _result_;
-#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1__length1 = _result__length1;
-#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_array_add10 (&_result_, &_result__length1, &__result__size_, PUBLISHING_FACEBOOK_RESOLUTION_STANDARD);
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = _result_;
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2__length1 = _result__length1;
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_array_add11 (&_result_, &_result__length1, &__result__size_, PUBLISHING_FACEBOOK_RESOLUTION_HIGH);
-#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = _result_;
-#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3__length1 = _result__length1;
-#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (result_length1) {
-#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*result_length1 = _tmp3__length1;
-#line 7448 "FacebookPublishing.c"
+#line 5450 "FacebookPublishing.c"
 	}
-#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp3_;
-#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 7454 "FacebookPublishing.c"
+#line 5456 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_publishing_options_pane_installed (PublishingFacebookPublishingOptionsPane* self) {
 	gboolean _tmp0_ = FALSE;
 	GtkButton* _tmp24_ = NULL;
-#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 903 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = publishing_facebook_publishing_options_pane_publishing_photos (self);
-#line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp0_) {
-#line 7467 "FacebookPublishing.c"
+#line 5469 "FacebookPublishing.c"
 		PublishingFacebookAlbum** _tmp1_ = NULL;
 		gint _tmp1__length1 = 0;
-#line 1161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp1_ = self->priv->albums;
-#line 1161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp1__length1 = self->priv->albums_length1;
-#line 1161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (_tmp1__length1 == 0) {
-#line 7476 "FacebookPublishing.c"
+#line 5478 "FacebookPublishing.c"
 			GtkRadioButton* _tmp2_ = NULL;
 			GtkEntry* _tmp3_ = NULL;
 			GtkComboBoxText* _tmp4_ = NULL;
 			GtkRadioButton* _tmp5_ = NULL;
-#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp2_ = self->priv->create_new_radio;
-#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 906 "/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 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp3_ = self->priv->new_album_entry;
-#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			gtk_entry_set_text (_tmp3_, PUBLISHING_FACEBOOK_DEFAULT_ALBUM_NAME);
-#line 1164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp4_ = self->priv->existing_albums_combo;
-#line 1164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 908 "/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 1165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp5_ = self->priv->use_existing_radio;
-#line 1165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 909 "/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 7497 "FacebookPublishing.c"
+#line 5499 "FacebookPublishing.c"
 		} else {
 			gint default_album_seq_num = 0;
 			gint ticker = 0;
 			PublishingFacebookAlbum** _tmp6_ = NULL;
 			gint _tmp6__length1 = 0;
 			gint _tmp15_ = 0;
-#line 1167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			default_album_seq_num = -1;
-#line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			ticker = 0;
-#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp6_ = self->priv->albums;
-#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp6__length1 = self->priv->albums_length1;
-#line 7512 "FacebookPublishing.c"
+#line 5514 "FacebookPublishing.c"
 			{
 				PublishingFacebookAlbum** album_collection = NULL;
 				gint album_collection_length1 = 0;
 				gint _album_collection_size_ = 0;
 				gint album_it = 0;
-#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				album_collection = _tmp6_;
-#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				album_collection_length1 = _tmp6__length1;
-#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				for (album_it = 0; album_it < _tmp6__length1; album_it = album_it + 1) {
-#line 7524 "FacebookPublishing.c"
+#line 5526 "FacebookPublishing.c"
 					PublishingFacebookAlbum* _tmp7_ = NULL;
 					PublishingFacebookAlbum* album = NULL;
-#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp7_ = _publishing_facebook_album_ref0 (album_collection[album_it]);
-#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					album = _tmp7_;
-#line 7531 "FacebookPublishing.c"
+#line 5533 "FacebookPublishing.c"
 					{
 						GtkComboBoxText* _tmp8_ = NULL;
 						PublishingFacebookAlbum* _tmp9_ = NULL;
@@ -7571,101 +5557,101 @@ void publishing_facebook_publishing_options_pane_installed (PublishingFacebookPu
 						PublishingFacebookAlbum* _tmp11_ = NULL;
 						const gchar* _tmp12_ = NULL;
 						gint _tmp14_ = 0;
-#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						_tmp8_ = self->priv->existing_albums_combo;
-#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						_tmp9_ = album;
-#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						_tmp10_ = _tmp9_->name;
-#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						gtk_combo_box_text_append_text (_tmp8_, _tmp10_);
-#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						_tmp11_ = album;
-#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						_tmp12_ = _tmp11_->name;
-#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						if (g_strcmp0 (_tmp12_, PUBLISHING_FACEBOOK_DEFAULT_ALBUM_NAME) == 0) {
-#line 7553 "FacebookPublishing.c"
+#line 5555 "FacebookPublishing.c"
 							gint _tmp13_ = 0;
-#line 1172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 							_tmp13_ = ticker;
-#line 1172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 							default_album_seq_num = _tmp13_;
-#line 7559 "FacebookPublishing.c"
+#line 5561 "FacebookPublishing.c"
 						}
-#line 1173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						_tmp14_ = ticker;
-#line 1173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						ticker = _tmp14_ + 1;
-#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						_publishing_facebook_album_unref0 (album);
-#line 7567 "FacebookPublishing.c"
+#line 5569 "FacebookPublishing.c"
 					}
 				}
 			}
-#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp15_ = default_album_seq_num;
-#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			if (_tmp15_ != -1) {
-#line 7575 "FacebookPublishing.c"
+#line 5577 "FacebookPublishing.c"
 				GtkComboBoxText* _tmp16_ = NULL;
 				gint _tmp17_ = 0;
 				GtkRadioButton* _tmp18_ = NULL;
 				GtkEntry* _tmp19_ = NULL;
-#line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp16_ = self->priv->existing_albums_combo;
-#line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp17_ = default_album_seq_num;
-#line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 920 "/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 1177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp18_ = self->priv->use_existing_radio;
-#line 1177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 921 "/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 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp19_ = self->priv->new_album_entry;
-#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 922 "/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 7594 "FacebookPublishing.c"
+#line 5596 "FacebookPublishing.c"
 			} else {
 				GtkRadioButton* _tmp20_ = NULL;
 				GtkComboBoxText* _tmp21_ = NULL;
 				GtkComboBoxText* _tmp22_ = NULL;
 				GtkEntry* _tmp23_ = NULL;
-#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp20_ = self->priv->create_new_radio;
-#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 925 "/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 1182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp21_ = self->priv->existing_albums_combo;
-#line 1182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 926 "/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 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp22_ = self->priv->existing_albums_combo;
-#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 927 "/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 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp23_ = self->priv->new_album_entry;
-#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				gtk_entry_set_text (_tmp23_, PUBLISHING_FACEBOOK_DEFAULT_ALBUM_NAME);
-#line 7616 "FacebookPublishing.c"
+#line 5618 "FacebookPublishing.c"
 			}
 		}
 	}
-#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp24_ = self->priv->publish_button;
-#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 933 "/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 7624 "FacebookPublishing.c"
+#line 5626 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_notify_logout (PublishingFacebookPublishingOptionsPane* self) {
-#line 1192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_emit_by_name (self, "logout");
-#line 7633 "FacebookPublishing.c"
+#line 5635 "FacebookPublishing.c"
 }
 
 
@@ -7675,23 +5661,23 @@ static void publishing_facebook_publishing_options_pane_notify_publish (Publishi
 	PublishingFacebookResolution _tmp2_ = 0;
 	GtkCheckButton* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (privacy_setting != NULL);
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = target_album;
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = privacy_setting;
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = target_resolution;
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = self->priv->strip_metadata_check;
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 941 "/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 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_emit_by_name (self, "publish", _tmp0_, _tmp1_, _tmp2_, _tmp4_);
-#line 7659 "FacebookPublishing.c"
+#line 5661 "FacebookPublishing.c"
 }
 
 
@@ -7700,58 +5686,58 @@ static GtkWidget* publishing_facebook_publishing_options_pane_real_get_widget (S
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_ = NULL;
 	GtkWidget* _tmp1_ = NULL;
-#line 1200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFacebookPublishingOptionsPane);
-#line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->pane_widget;
-#line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 945 "/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 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp1_;
-#line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 7678 "FacebookPublishing.c"
+#line 5680 "FacebookPublishing.c"
 }
 
 
 static SpitPublishingDialogPaneGeometryOptions publishing_facebook_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
 	PublishingFacebookPublishingOptionsPane * self;
 	SpitPublishingDialogPaneGeometryOptions result = 0;
-#line 1204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFacebookPublishingOptionsPane);
-#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 7691 "FacebookPublishing.c"
+#line 5693 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_publishing_options_pane_notify_logout_publishing_facebook_publishing_options_pane_logout (PublishingFacebookPublishingOptionsPane* _sender, gpointer self) {
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_notify_logout ((PublishingFacebookPublishingOptionsPane*) self);
-#line 7698 "FacebookPublishing.c"
+#line 5700 "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 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 954 "/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 7705 "FacebookPublishing.c"
+#line 5707 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
 	PublishingFacebookPublishingOptionsPane * self;
-#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFacebookPublishingOptionsPane);
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 953 "/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 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 954 "/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 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 956 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_installed (self);
-#line 7719 "FacebookPublishing.c"
+#line 5721 "FacebookPublishing.c"
 }
 
 
@@ -7759,17 +5745,17 @@ static void publishing_facebook_publishing_options_pane_real_on_pane_uninstalled
 	PublishingFacebookPublishingOptionsPane * self;
 	guint _tmp0_ = 0U;
 	guint _tmp1_ = 0U;
-#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFacebookPublishingOptionsPane);
-#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 960 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("logout", PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp0_, NULL, FALSE);
-#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 960 "/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 1217 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("publish", PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE);
-#line 1217 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 961 "/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 7737 "FacebookPublishing.c"
+#line 5739 "FacebookPublishing.c"
 }
 
 
@@ -7780,27 +5766,27 @@ static void g_cclosure_user_marshal_VOID__STRING_STRING_ENUM_BOOLEAN (GClosure *
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (n_param_values == 5);
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		data1 = closure->data;
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 7756 "FacebookPublishing.c"
+#line 5758 "FacebookPublishing.c"
 	} else {
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		data2 = closure->data;
-#line 7762 "FacebookPublishing.c"
+#line 5764 "FacebookPublishing.c"
 	}
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	callback = (GMarshalFunc_VOID__STRING_STRING_ENUM_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/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 7768 "FacebookPublishing.c"
+#line 5770 "FacebookPublishing.c"
 }
 
 
@@ -7810,248 +5796,248 @@ static PublishingFacebookPublishingOptionsPanePrivacyDescription* publishing_fac
 	gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (description != NULL, NULL);
-#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (privacy_setting != NULL, NULL);
-#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = (PublishingFacebookPublishingOptionsPanePrivacyDescription*) g_type_create_instance (object_type);
-#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = description;
-#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->description);
-#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->description = _tmp1_;
-#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = privacy_setting;
-#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->privacy_setting);
-#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->privacy_setting = _tmp3_;
-#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 7802 "FacebookPublishing.c"
+#line 5804 "FacebookPublishing.c"
 }
 
 
 static PublishingFacebookPublishingOptionsPanePrivacyDescription* publishing_facebook_publishing_options_pane_privacy_description_new (const gchar* description, const gchar* privacy_setting) {
-#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 737 "/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 7809 "FacebookPublishing.c"
+#line 5811 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_value_privacy_description_init (GValue* value) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 7816 "FacebookPublishing.c"
+#line 5818 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_value_privacy_description_free_value (GValue* value) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_options_pane_privacy_description_unref (value->data[0].v_pointer);
-#line 7825 "FacebookPublishing.c"
+#line 5827 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_publishing_options_pane_value_privacy_description_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/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 7835 "FacebookPublishing.c"
+#line 5837 "FacebookPublishing.c"
 	} else {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 7839 "FacebookPublishing.c"
+#line 5841 "FacebookPublishing.c"
 	}
 }
 
 
 static gpointer publishing_facebook_publishing_options_pane_value_privacy_description_peek_pointer (const GValue* value) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 7847 "FacebookPublishing.c"
+#line 5849 "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 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 7854 "FacebookPublishing.c"
+#line 5856 "FacebookPublishing.c"
 		PublishingFacebookPublishingOptionsPanePrivacyDescription* object;
 		object = collect_values[0].v_pointer;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/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 7861 "FacebookPublishing.c"
+#line 5863 "FacebookPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/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 7865 "FacebookPublishing.c"
+#line 5867 "FacebookPublishing.c"
 		}
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = publishing_facebook_publishing_options_pane_privacy_description_ref (object);
-#line 7869 "FacebookPublishing.c"
+#line 5871 "FacebookPublishing.c"
 	} else {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 7873 "FacebookPublishing.c"
+#line 5875 "FacebookPublishing.c"
 	}
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 7877 "FacebookPublishing.c"
+#line 5879 "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 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!object_p) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/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 7888 "FacebookPublishing.c"
+#line 5890 "FacebookPublishing.c"
 	}
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = NULL;
-#line 7894 "FacebookPublishing.c"
+#line 5896 "FacebookPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 7898 "FacebookPublishing.c"
+#line 5900 "FacebookPublishing.c"
 	} else {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/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 7902 "FacebookPublishing.c"
+#line 5904 "FacebookPublishing.c"
 	}
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 7906 "FacebookPublishing.c"
+#line 5908 "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 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/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 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 7920 "FacebookPublishing.c"
+#line 5922 "FacebookPublishing.c"
 }
 
 
 static gpointer publishing_facebook_publishing_options_pane_value_get_privacy_description (const GValue* value) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/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 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 7929 "FacebookPublishing.c"
+#line 5931 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_value_set_privacy_description (GValue* value, gpointer v_object) {
 	PublishingFacebookPublishingOptionsPanePrivacyDescription* old;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/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 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (v_object) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/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 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/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 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_options_pane_privacy_description_ref (value->data[0].v_pointer);
-#line 7949 "FacebookPublishing.c"
+#line 5951 "FacebookPublishing.c"
 	} else {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 7953 "FacebookPublishing.c"
+#line 5955 "FacebookPublishing.c"
 	}
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_options_pane_privacy_description_unref (old);
-#line 7959 "FacebookPublishing.c"
+#line 5961 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_publishing_options_pane_value_take_privacy_description (GValue* value, gpointer v_object) {
 	PublishingFacebookPublishingOptionsPanePrivacyDescription* old;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/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 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (v_object) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/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 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/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 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 7978 "FacebookPublishing.c"
+#line 5980 "FacebookPublishing.c"
 	} else {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 7982 "FacebookPublishing.c"
+#line 5984 "FacebookPublishing.c"
 	}
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_options_pane_privacy_description_unref (old);
-#line 7988 "FacebookPublishing.c"
+#line 5990 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_publishing_options_pane_privacy_description_class_init (PublishingFacebookPublishingOptionsPanePrivacyDescriptionClass * klass) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/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 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookPublishingOptionsPanePrivacyDescriptionClass *) klass)->finalize = publishing_facebook_publishing_options_pane_privacy_description_finalize;
-#line 7998 "FacebookPublishing.c"
+#line 6000 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_privacy_description_instance_init (PublishingFacebookPublishingOptionsPanePrivacyDescription * self) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->ref_count = 1;
-#line 8005 "FacebookPublishing.c"
+#line 6007 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_privacy_description_finalize (PublishingFacebookPublishingOptionsPanePrivacyDescription* obj) {
 	PublishingFacebookPublishingOptionsPanePrivacyDescription * self;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/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 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->description);
-#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->privacy_setting);
-#line 8019 "FacebookPublishing.c"
+#line 6021 "FacebookPublishing.c"
 }
 
 
@@ -8072,134 +6058,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 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return instance;
-#line 8044 "FacebookPublishing.c"
+#line 6046 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_privacy_description_unref (gpointer instance) {
 	PublishingFacebookPublishingOptionsPanePrivacyDescription* self;
 	self = instance;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_PRIVACY_DESCRIPTION_GET_CLASS (self)->finalize (self);
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 8057 "FacebookPublishing.c"
+#line 6059 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_publishing_options_pane_class_init (PublishingFacebookPublishingOptionsPaneClass * klass) {
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_parent_class = g_type_class_peek_parent (klass);
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFacebookPublishingOptionsPanePrivate));
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_facebook_publishing_options_pane_finalize;
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/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 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/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 8073 "FacebookPublishing.c"
+#line 6075 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/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 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_facebook_publishing_options_pane_real_get_widget;
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/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 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/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 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/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 8088 "FacebookPublishing.c"
+#line 6090 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_instance_init (PublishingFacebookPublishingOptionsPane * self) {
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv = PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
-#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->pane_widget = NULL;
-#line 964 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->use_existing_radio = NULL;
-#line 965 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->create_new_radio = NULL;
-#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->existing_albums_combo = NULL;
-#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->visibility_combo = NULL;
-#line 968 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->new_album_entry = NULL;
-#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->strip_metadata_check = NULL;
-#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->publish_button = NULL;
-#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->logout_button = NULL;
-#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->how_to_label = NULL;
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->albums = NULL;
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->albums_length1 = 0;
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->_albums_size_ = self->priv->albums_length1;
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->publisher = NULL;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->resolution_combo = NULL;
-#line 8125 "FacebookPublishing.c"
+#line 6127 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_finalize (GObject* obj) {
 	PublishingFacebookPublishingOptionsPane * self;
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFacebookPublishingOptionsPane);
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->pane_widget);
-#line 964 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->use_existing_radio);
-#line 965 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->create_new_radio);
-#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->existing_albums_combo);
-#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->visibility_combo);
-#line 968 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->new_album_entry);
-#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->strip_metadata_check);
-#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->publish_button);
-#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->logout_button);
-#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->how_to_label);
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 714 "/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 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->publisher);
-#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 716 "/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 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->possible_resolutions = (g_free (self->priv->possible_resolutions), NULL);
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->resolution_combo);
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_OBJECT_CLASS (publishing_facebook_publishing_options_pane_parent_class)->finalize (obj);
-#line 8167 "FacebookPublishing.c"
+#line 6169 "FacebookPublishing.c"
 }
 
 
@@ -8219,52 +6205,52 @@ GType publishing_facebook_publishing_options_pane_get_type (void) {
 
 gchar* publishing_facebook_endpoint_to_uri (PublishingFacebookEndpoint self) {
 	gchar* result = NULL;
-#line 1227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	switch (self) {
-#line 1227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case PUBLISHING_FACEBOOK_ENDPOINT_DEFAULT:
-#line 8191 "FacebookPublishing.c"
+#line 6193 "FacebookPublishing.c"
 		{
 			gchar* _tmp0_ = NULL;
-#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp0_ = g_strdup ("https://graph.facebook.com/");
-#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			result = _tmp0_;
-#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return result;
-#line 8200 "FacebookPublishing.c"
+#line 6202 "FacebookPublishing.c"
 		}
-#line 1227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case PUBLISHING_FACEBOOK_ENDPOINT_VIDEO:
-#line 8204 "FacebookPublishing.c"
+#line 6206 "FacebookPublishing.c"
 		{
 			gchar* _tmp1_ = NULL;
-#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp1_ = g_strdup ("https://graph-video.facebook.com/");
-#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			result = _tmp1_;
-#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return result;
-#line 8213 "FacebookPublishing.c"
+#line 6215 "FacebookPublishing.c"
 		}
-#line 1227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case PUBLISHING_FACEBOOK_ENDPOINT_TEST_CONNECTION:
-#line 8217 "FacebookPublishing.c"
+#line 6219 "FacebookPublishing.c"
 		{
 			gchar* _tmp2_ = NULL;
-#line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp2_ = g_strdup ("https://www.facebook.com/");
-#line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			result = _tmp2_;
-#line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return result;
-#line 8226 "FacebookPublishing.c"
+#line 6228 "FacebookPublishing.c"
 		}
 		default:
 		{
-#line 1238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			g_assert_not_reached ();
-#line 8232 "FacebookPublishing.c"
+#line 6234 "FacebookPublishing.c"
 		}
 	}
 }
@@ -8283,48 +6269,48 @@ GType publishing_facebook_endpoint_get_type (void) {
 
 
 static gchar* publishing_facebook_graph_message_real_get_uri (PublishingFacebookGraphMessage* self) {
-#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/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 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 8255 "FacebookPublishing.c"
+#line 6257 "FacebookPublishing.c"
 }
 
 
 gchar* publishing_facebook_graph_message_get_uri (PublishingFacebookGraphMessage* self) {
-#line 1248 "/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 (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (self), NULL);
-#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return PUBLISHING_FACEBOOK_GRAPH_MESSAGE_GET_CLASS (self)->get_uri (self);
-#line 8264 "FacebookPublishing.c"
+#line 6266 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_graph_message_real_get_response_body (PublishingFacebookGraphMessage* self) {
-#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 993 "/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 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 8273 "FacebookPublishing.c"
+#line 6275 "FacebookPublishing.c"
 }
 
 
 gchar* publishing_facebook_graph_message_get_response_body (PublishingFacebookGraphMessage* self) {
-#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (self), NULL);
-#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return PUBLISHING_FACEBOOK_GRAPH_MESSAGE_GET_CLASS (self)->get_response_body (self);
-#line 8282 "FacebookPublishing.c"
+#line 6284 "FacebookPublishing.c"
 }
 
 
 PublishingFacebookGraphMessage* publishing_facebook_graph_message_construct (GType object_type) {
 	PublishingFacebookGraphMessage* self = NULL;
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = (PublishingFacebookGraphMessage*) g_type_create_instance (object_type);
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 8292 "FacebookPublishing.c"
+#line 6294 "FacebookPublishing.c"
 }
 
 
@@ -8335,243 +6321,243 @@ static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, GValue *
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (n_param_values == 3);
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		data1 = closure->data;
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 8311 "FacebookPublishing.c"
+#line 6313 "FacebookPublishing.c"
 	} else {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		data2 = closure->data;
-#line 8317 "FacebookPublishing.c"
+#line 6319 "FacebookPublishing.c"
 	}
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	callback = (GMarshalFunc_VOID__INT_INT) (marshal_data ? marshal_data : cc->callback);
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/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 8323 "FacebookPublishing.c"
+#line 6325 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_value_graph_message_init (GValue* value) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 8330 "FacebookPublishing.c"
+#line 6332 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_value_graph_message_free_value (GValue* value) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_message_unref (value->data[0].v_pointer);
-#line 8339 "FacebookPublishing.c"
+#line 6341 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_value_graph_message_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/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 8349 "FacebookPublishing.c"
+#line 6351 "FacebookPublishing.c"
 	} else {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 8353 "FacebookPublishing.c"
+#line 6355 "FacebookPublishing.c"
 	}
 }
 
 
 static gpointer publishing_facebook_value_graph_message_peek_pointer (const GValue* value) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 8361 "FacebookPublishing.c"
+#line 6363 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_value_graph_message_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 8368 "FacebookPublishing.c"
+#line 6370 "FacebookPublishing.c"
 		PublishingFacebookGraphMessage* object;
 		object = collect_values[0].v_pointer;
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/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 8375 "FacebookPublishing.c"
+#line 6377 "FacebookPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/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 8379 "FacebookPublishing.c"
+#line 6381 "FacebookPublishing.c"
 		}
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = publishing_facebook_graph_message_ref (object);
-#line 8383 "FacebookPublishing.c"
+#line 6385 "FacebookPublishing.c"
 	} else {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8387 "FacebookPublishing.c"
+#line 6389 "FacebookPublishing.c"
 	}
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 8391 "FacebookPublishing.c"
+#line 6393 "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 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!object_p) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/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 8402 "FacebookPublishing.c"
+#line 6404 "FacebookPublishing.c"
 	}
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = NULL;
-#line 8408 "FacebookPublishing.c"
+#line 6410 "FacebookPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 8412 "FacebookPublishing.c"
+#line 6414 "FacebookPublishing.c"
 	} else {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = publishing_facebook_graph_message_ref (value->data[0].v_pointer);
-#line 8416 "FacebookPublishing.c"
+#line 6418 "FacebookPublishing.c"
 	}
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 8420 "FacebookPublishing.c"
+#line 6422 "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 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/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 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 8434 "FacebookPublishing.c"
+#line 6436 "FacebookPublishing.c"
 }
 
 
 gpointer publishing_facebook_value_get_graph_message (const GValue* value) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/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 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 8443 "FacebookPublishing.c"
+#line 6445 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_value_set_graph_message (GValue* value, gpointer v_object) {
 	PublishingFacebookGraphMessage* old;
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/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 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (v_object) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/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 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/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 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_message_ref (value->data[0].v_pointer);
-#line 8463 "FacebookPublishing.c"
+#line 6465 "FacebookPublishing.c"
 	} else {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8467 "FacebookPublishing.c"
+#line 6469 "FacebookPublishing.c"
 	}
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_message_unref (old);
-#line 8473 "FacebookPublishing.c"
+#line 6475 "FacebookPublishing.c"
 	}
 }
 
 
 void publishing_facebook_value_take_graph_message (GValue* value, gpointer v_object) {
 	PublishingFacebookGraphMessage* old;
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/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 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (v_object) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/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 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/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 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 8492 "FacebookPublishing.c"
+#line 6494 "FacebookPublishing.c"
 	} else {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8496 "FacebookPublishing.c"
+#line 6498 "FacebookPublishing.c"
 	}
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_message_unref (old);
-#line 8502 "FacebookPublishing.c"
+#line 6504 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_graph_message_class_init (PublishingFacebookGraphMessageClass * klass) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_message_parent_class = g_type_class_peek_parent (klass);
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookGraphMessageClass *) klass)->finalize = publishing_facebook_graph_message_finalize;
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookGraphMessageClass *) klass)->get_uri = publishing_facebook_graph_message_real_get_uri;
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookGraphMessageClass *) klass)->get_response_body = publishing_facebook_graph_message_real_get_response_body;
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/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 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/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 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/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 8522 "FacebookPublishing.c"
+#line 6524 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_graph_message_instance_init (PublishingFacebookGraphMessage * self) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->ref_count = 1;
-#line 8529 "FacebookPublishing.c"
+#line 6531 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_graph_message_finalize (PublishingFacebookGraphMessage* obj) {
 	PublishingFacebookGraphMessage * self;
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage);
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 8539 "FacebookPublishing.c"
+#line 6541 "FacebookPublishing.c"
 }
 
 
@@ -8592,32 +6578,32 @@ GType publishing_facebook_graph_message_get_type (void) {
 gpointer publishing_facebook_graph_message_ref (gpointer instance) {
 	PublishingFacebookGraphMessage* self;
 	self = instance;
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return instance;
-#line 8564 "FacebookPublishing.c"
+#line 6566 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_graph_message_unref (gpointer instance) {
 	PublishingFacebookGraphMessage* self;
 	self = instance;
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		PUBLISHING_FACEBOOK_GRAPH_MESSAGE_GET_CLASS (self)->finalize (self);
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 8577 "FacebookPublishing.c"
+#line 6579 "FacebookPublishing.c"
 	}
 }
 
 
 static void _publishing_facebook_graph_session_on_request_unqueued_soup_session_request_unqueued (SoupSession* _sender, SoupMessage* msg, gpointer self) {
-#line 1428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_session_on_request_unqueued ((PublishingFacebookGraphSession*) self, msg);
-#line 8585 "FacebookPublishing.c"
+#line 6587 "FacebookPublishing.c"
 }
 
 
@@ -8627,51 +6613,51 @@ PublishingFacebookGraphSession* publishing_facebook_graph_session_construct (GTy
 	SoupSession* _tmp1_ = NULL;
 	SoupSession* _tmp2_ = NULL;
 	SoupSession* _tmp3_ = NULL;
-#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = (PublishingFacebookGraphSession*) g_type_create_instance (object_type);
-#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = soup_session_new ();
-#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->soup_session);
-#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1163 "/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"
+#line 1164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->soup_session;
-#line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1164 "/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 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = self->priv->soup_session;
-#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_object_set (_tmp2_, "timeout", (guint) 15, NULL);
-#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->priv->access_token);
-#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->access_token = NULL;
-#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (self->priv->current_message);
-#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->current_message = NULL;
-#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = self->priv->soup_session;
-#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_object_set (_tmp3_, "ssl-use-system-ca-file", TRUE, NULL);
-#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 8625 "FacebookPublishing.c"
+#line 6627 "FacebookPublishing.c"
 }
 
 
 PublishingFacebookGraphSession* publishing_facebook_graph_session_new (void) {
-#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_graph_session_construct (PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION);
-#line 8632 "FacebookPublishing.c"
+#line 6634 "FacebookPublishing.c"
 }
 
 
 static gpointer _publishing_facebook_graph_message_ref0 (gpointer self) {
-#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? publishing_facebook_graph_message_ref (self) : NULL;
-#line 8639 "FacebookPublishing.c"
+#line 6641 "FacebookPublishing.c"
 }
 
 
@@ -8679,48 +6665,48 @@ static void publishing_facebook_graph_session_manage_message (PublishingFacebook
 	PublishingFacebookGraphMessage* _tmp0_ = NULL;
 	PublishingFacebookGraphMessage* _tmp1_ = NULL;
 	PublishingFacebookGraphMessage* _tmp2_ = NULL;
-#line 1431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self));
-#line 1431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (msg));
-#line 1432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->current_message;
-#line 1432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_assert (_tmp0_ == NULL, "current_message == null");
-#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = msg;
-#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = _publishing_facebook_graph_message_ref0 (_tmp1_);
-#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (self->priv->current_message);
-#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->current_message = _tmp2_;
-#line 8663 "FacebookPublishing.c"
+#line 6665 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_graph_session_unmanage_message (PublishingFacebookGraphSession* self, PublishingFacebookGraphMessage* msg) {
 	PublishingFacebookGraphMessage* _tmp0_ = NULL;
-#line 1437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self));
-#line 1437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (msg));
-#line 1438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->current_message;
-#line 1438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_assert (_tmp0_ != NULL, "current_message != null");
-#line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (self->priv->current_message);
-#line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->current_message = NULL;
-#line 8681 "FacebookPublishing.c"
+#line 6683 "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 1459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data ((PublishingFacebookGraphSessionGraphMessageImpl*) self, chunk);
-#line 8688 "FacebookPublishing.c"
+#line 6690 "FacebookPublishing.c"
 }
 
 
@@ -8747,149 +6733,149 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac
 	guint _tmp27_ = 0U;
 	GError* _tmp68_ = NULL;
 	GError* _tmp80_ = NULL;
-#line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self));
-#line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (SOUP_IS_MESSAGE (msg));
-#line 1444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->current_message;
-#line 1444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_assert (_tmp0_ != NULL, "current_message != null");
-#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->current_message;
-#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1189 "/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 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	real_message = _tmp2_;
-#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = real_message;
-#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = _tmp3_->soup_message;
-#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = msg;
-#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_assert (_tmp4_ == _tmp5_, "real_message.soup_message == msg");
-#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = msg;
-#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_object_get (_tmp8_, "status-code", &_tmp9_, NULL);
-#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = _tmp9_;
-#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp10_ == ((guint) SOUP_STATUS_IO_ERROR)) {
-#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp7_ = TRUE;
-#line 8747 "FacebookPublishing.c"
+#line 6749 "FacebookPublishing.c"
 	} else {
 		SoupMessage* _tmp11_ = NULL;
 		guint _tmp12_ = 0U;
 		guint _tmp13_ = 0U;
-#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp11_ = msg;
-#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_object_get (_tmp11_, "status-code", &_tmp12_, NULL);
-#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp13_ = _tmp12_;
-#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp7_ = _tmp13_ == ((guint) SOUP_STATUS_MALFORMED);
-#line 8760 "FacebookPublishing.c"
+#line 6762 "FacebookPublishing.c"
 	}
-#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp7_) {
-#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp6_ = TRUE;
-#line 8766 "FacebookPublishing.c"
+#line 6768 "FacebookPublishing.c"
 	} else {
 		SoupMessage* _tmp14_ = NULL;
 		guint _tmp15_ = 0U;
 		guint _tmp16_ = 0U;
-#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp14_ = msg;
-#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_object_get (_tmp14_, "status-code", &_tmp15_, NULL);
-#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp16_ = _tmp15_;
-#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp6_ = _tmp16_ == ((guint) SOUP_STATUS_TRY_AGAIN);
-#line 8779 "FacebookPublishing.c"
+#line 6781 "FacebookPublishing.c"
 	}
-#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp6_) {
-#line 8783 "FacebookPublishing.c"
+#line 6785 "FacebookPublishing.c"
 		PublishingFacebookGraphSessionGraphMessageImpl* _tmp17_ = NULL;
 		SoupSession* _tmp18_ = NULL;
 		SoupMessage* _tmp19_ = NULL;
 		SoupMessage* _tmp20_ = NULL;
-#line 1453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp17_ = real_message;
-#line 1453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp17_->bytes_so_far = 0;
-#line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp18_ = self->priv->soup_session;
-#line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp19_ = msg;
-#line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp20_ = _g_object_ref0 (_tmp19_);
-#line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		soup_session_queue_message (_tmp18_, _tmp20_, NULL, NULL);
-#line 1455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_publishing_facebook_graph_message_unref0 (real_message);
-#line 1455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 8804 "FacebookPublishing.c"
+#line 6806 "FacebookPublishing.c"
 	}
-#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp21_ = real_message;
-#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1202 "/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 1459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp22_ = msg;
-#line 1459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp23_ = real_message;
-#line 1459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("wrote-body-data", soup_message_get_type (), &_tmp24_, NULL, FALSE);
-#line 1459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1203 "/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 1461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_error_ = NULL;
-#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp25_ = msg;
-#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_object_get (_tmp25_, "status-code", &_tmp26_, NULL);
-#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp27_ = _tmp26_;
-#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	switch (_tmp27_) {
-#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case SOUP_STATUS_OK:
-#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case SOUP_STATUS_CREATED:
-#line 8832 "FacebookPublishing.c"
+#line 6834 "FacebookPublishing.c"
 		{
-#line 1467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			break;
-#line 8836 "FacebookPublishing.c"
+#line 6838 "FacebookPublishing.c"
 		}
-#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case PUBLISHING_FACEBOOK_EXPIRED_SESSION_STATUS_CODE:
-#line 8840 "FacebookPublishing.c"
+#line 6842 "FacebookPublishing.c"
 		{
 			GError* _tmp28_ = NULL;
-#line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1214 "/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 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_error_free0 (_error_);
-#line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_error_ = _tmp28_;
-#line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			break;
-#line 8851 "FacebookPublishing.c"
+#line 6853 "FacebookPublishing.c"
 		}
-#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case SOUP_STATUS_CANT_RESOLVE:
-#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case SOUP_STATUS_CANT_RESOLVE_PROXY:
-#line 8857 "FacebookPublishing.c"
+#line 6859 "FacebookPublishing.c"
 		{
 			PublishingFacebookGraphSessionGraphMessageImpl* _tmp29_ = NULL;
 			gchar* _tmp30_ = NULL;
@@ -8898,35 +6884,35 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac
 			guint _tmp33_ = 0U;
 			guint _tmp34_ = 0U;
 			GError* _tmp35_ = NULL;
-#line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp29_ = real_message;
-#line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1220 "/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 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp31_ = _tmp30_;
-#line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp32_ = msg;
-#line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			g_object_get (_tmp32_, "status-code", &_tmp33_, NULL);
-#line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp34_ = _tmp33_;
-#line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1220 "/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 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_error_free0 (_error_);
-#line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_error_ = _tmp35_;
-#line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_free0 (_tmp31_);
-#line 1478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			break;
-#line 8888 "FacebookPublishing.c"
+#line 6890 "FacebookPublishing.c"
 		}
-#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case SOUP_STATUS_CANT_CONNECT:
-#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case SOUP_STATUS_CANT_CONNECT_PROXY:
-#line 8894 "FacebookPublishing.c"
+#line 6896 "FacebookPublishing.c"
 		{
 			PublishingFacebookGraphSessionGraphMessageImpl* _tmp36_ = NULL;
 			gchar* _tmp37_ = NULL;
@@ -8935,44 +6921,44 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac
 			guint _tmp40_ = 0U;
 			guint _tmp41_ = 0U;
 			GError* _tmp42_ = NULL;
-#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp36_ = real_message;
-#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1226 "/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 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp38_ = _tmp37_;
-#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp39_ = msg;
-#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			g_object_get (_tmp39_, "status-code", &_tmp40_, NULL);
-#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp41_ = _tmp40_;
-#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1226 "/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 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_error_free0 (_error_);
-#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_error_ = _tmp42_;
-#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_free0 (_tmp38_);
-#line 1484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			break;
-#line 8925 "FacebookPublishing.c"
+#line 6927 "FacebookPublishing.c"
 		}
 		default:
 		{
 			SoupMessage* _tmp43_ = NULL;
 			guint _tmp44_ = 0U;
 			guint _tmp45_ = 0U;
-#line 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp43_ = msg;
-#line 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			g_object_get (_tmp43_, "status-code", &_tmp44_, NULL);
-#line 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp45_ = _tmp44_;
-#line 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			if (_tmp45_ >= ((guint) 100)) {
-#line 8940 "FacebookPublishing.c"
+#line 6942 "FacebookPublishing.c"
 				PublishingFacebookGraphSessionGraphMessageImpl* _tmp46_ = NULL;
 				gchar* _tmp47_ = NULL;
 				gchar* _tmp48_ = NULL;
@@ -8984,37 +6970,37 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac
 				gchar* _tmp54_ = NULL;
 				gchar* _tmp55_ = NULL;
 				GError* _tmp56_ = NULL;
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp46_ = real_message;
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1234 "/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 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp48_ = _tmp47_;
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp49_ = msg;
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				g_object_get (_tmp49_, "status-code", &_tmp50_, NULL);
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp51_ = _tmp50_;
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp52_ = msg;
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				g_object_get (_tmp52_, "reason-phrase", &_tmp53_, NULL);
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp54_ = _tmp53_;
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp55_ = _tmp54_;
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1234 "/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 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_g_error_free0 (_error_);
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_error_ = _tmp56_;
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_g_free0 (_tmp55_);
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_g_free0 (_tmp48_);
-#line 8982 "FacebookPublishing.c"
+#line 6984 "FacebookPublishing.c"
 			} else {
 				SoupMessage* _tmp57_ = NULL;
 				gchar* _tmp58_ = NULL;
@@ -9027,210 +7013,172 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac
 				guint _tmp65_ = 0U;
 				guint _tmp66_ = 0U;
 				GError* _tmp67_ = NULL;
-#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp57_ = msg;
-#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				g_object_get (_tmp57_, "reason-phrase", &_tmp58_, NULL);
-#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp59_ = _tmp58_;
-#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp60_ = _tmp59_;
-#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"
+#line 1238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+				g_debug ("FacebookPublishing.vala:1238: %s", _tmp60_);
+#line 1238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_g_free0 (_tmp60_);
-#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp61_ = real_message;
-#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1239 "/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 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp63_ = _tmp62_;
-#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp64_ = msg;
-#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				g_object_get (_tmp64_, "status-code", &_tmp65_, NULL);
-#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp66_ = _tmp65_;
-#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1239 "/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 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_g_error_free0 (_error_);
-#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_error_ = _tmp67_;
-#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_g_free0 (_tmp63_);
-#line 9027 "FacebookPublishing.c"
+#line 7029 "FacebookPublishing.c"
 			}
-#line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			break;
-#line 9031 "FacebookPublishing.c"
+#line 7033 "FacebookPublishing.c"
 		}
 	}
-#line 1503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp68_ = _error_;
-#line 1503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp68_ == NULL) {
-#line 9038 "FacebookPublishing.c"
+#line 7040 "FacebookPublishing.c"
 		gboolean _tmp69_ = FALSE;
 		SoupMessage* _tmp70_ = NULL;
 		SoupMessageBody* _tmp71_ = NULL;
 		guint8* _tmp72_ = NULL;
 		gint _tmp72__length1 = 0;
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp70_ = msg;
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp71_ = _tmp70_->response_body;
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp72_ = _tmp71_->data;
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp72__length1 = (gint) _tmp71_->length;
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (_tmp72_ == NULL) {
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp69_ = TRUE;
-#line 9056 "FacebookPublishing.c"
+#line 7058 "FacebookPublishing.c"
 		} else {
 			SoupMessage* _tmp73_ = NULL;
 			SoupMessageBody* _tmp74_ = NULL;
 			guint8* _tmp75_ = NULL;
 			gint _tmp75__length1 = 0;
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp73_ = msg;
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp74_ = _tmp73_->response_body;
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp75_ = _tmp74_->data;
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp75__length1 = (gint) _tmp74_->length;
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp69_ = _tmp75__length1 == 0;
-#line 9072 "FacebookPublishing.c"
+#line 7074 "FacebookPublishing.c"
 		}
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (_tmp69_) {
-#line 9076 "FacebookPublishing.c"
+#line 7078 "FacebookPublishing.c"
 			PublishingFacebookGraphSessionGraphMessageImpl* _tmp76_ = NULL;
 			gchar* _tmp77_ = NULL;
 			gchar* _tmp78_ = NULL;
 			GError* _tmp79_ = NULL;
-#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp76_ = real_message;
-#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1249 "/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 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp78_ = _tmp77_;
-#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1249 "/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 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_error_free0 (_error_);
-#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_error_ = _tmp79_;
-#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_free0 (_tmp78_);
-#line 9095 "FacebookPublishing.c"
+#line 7097 "FacebookPublishing.c"
 		}
 	}
-#line 1508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp80_ = _error_;
-#line 1508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp80_ == NULL) {
-#line 9102 "FacebookPublishing.c"
+#line 7104 "FacebookPublishing.c"
 		PublishingFacebookGraphSessionGraphMessageImpl* _tmp81_ = NULL;
-#line 1509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp81_ = real_message;
-#line 1509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1253 "/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 9108 "FacebookPublishing.c"
+#line 7110 "FacebookPublishing.c"
 	} else {
 		PublishingFacebookGraphSessionGraphMessageImpl* _tmp82_ = NULL;
 		GError* _tmp83_ = NULL;
-#line 1511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp82_ = real_message;
-#line 1511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp83_ = _error_;
-#line 1511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1255 "/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 9118 "FacebookPublishing.c"
+#line 7120 "FacebookPublishing.c"
 	}
-#line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_error_free0 (_error_);
-#line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (real_message);
-#line 9124 "FacebookPublishing.c"
+#line 7126 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_graph_session_authenticate (PublishingFacebookGraphSession* self, const gchar* access_token) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self));
-#line 1514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (access_token != NULL);
-#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = access_token;
-#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->priv->access_token);
-#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->access_token = _tmp1_;
-#line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_emit_by_name (self, "authenticated");
-#line 9145 "FacebookPublishing.c"
+#line 7147 "FacebookPublishing.c"
 }
 
 
 gboolean publishing_facebook_graph_session_is_authenticated (PublishingFacebookGraphSession* self) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
-#line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self), FALSE);
-#line 1520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->access_token;
-#line 1520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp0_ != NULL;
-#line 1520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	return result;
-#line 9160 "FacebookPublishing.c"
-}
-
-
-gchar* publishing_facebook_graph_session_get_access_token (PublishingFacebookGraphSession* self) {
-	gchar* result = NULL;
-	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-#line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self), NULL);
-#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = publishing_facebook_graph_session_is_authenticated (self);
-#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_vala_assert (_tmp0_, "is_authenticated()");
-#line 1525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = self->priv->access_token;
-#line 1525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = g_strdup (_tmp1_);
-#line 1525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	result = _tmp2_;
-#line 1525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	return result;
-#line 9183 "FacebookPublishing.c"
-}
-
-
-PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_endpoint_test (PublishingFacebookGraphSession* self) {
-	PublishingFacebookGraphMessage* result = NULL;
-	PublishingFacebookGraphSessionGraphEndpointProbeMessage* _tmp0_ = NULL;
-#line 1528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self), NULL);
-#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = publishing_facebook_graph_session_graph_endpoint_probe_message_new (self);
-#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 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 9198 "FacebookPublishing.c"
+#line 7162 "FacebookPublishing.c"
 }
 
 
@@ -9239,21 +7187,21 @@ PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_query (Pub
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	PublishingFacebookGraphSessionGraphQueryMessage* _tmp2_ = NULL;
-#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self), NULL);
-#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (resource_path != NULL, NULL);
-#line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = resource_path;
-#line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->access_token;
-#line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = publishing_facebook_graph_session_graph_query_message_new (self, _tmp0_, _tmp1_);
-#line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage);
-#line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 9221 "FacebookPublishing.c"
+#line 7185 "FacebookPublishing.c"
 }
 
 
@@ -9265,29 +7213,29 @@ PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_upload (Pu
 	gboolean _tmp3_ = FALSE;
 	const gchar* _tmp4_ = NULL;
 	PublishingFacebookGraphSessionGraphUploadMessage* _tmp5_ = NULL;
-#line 1536 "/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_IS_GRAPH_SESSION (self), NULL);
-#line 1536 "/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 (resource_path != NULL, NULL);
-#line 1536 "/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 (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->access_token;
-#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = resource_path;
-#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = publishable;
-#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = suppress_titling;
-#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = resource_privacy;
-#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1279 "/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 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage);
-#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 9255 "FacebookPublishing.c"
+#line 7219 "FacebookPublishing.c"
 }
 
 
@@ -9297,25 +7245,25 @@ PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_create_alb
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	PublishingFacebookGraphSessionGraphCreateAlbumMessage* _tmp3_ = NULL;
-#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self), NULL);
-#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (album_name != NULL, NULL);
-#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (privacy != NULL, NULL);
-#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->access_token;
-#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = album_name;
-#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = privacy;
-#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = publishing_facebook_graph_session_graph_create_album_message_new (self, _tmp0_, _tmp1_, _tmp2_);
-#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage);
-#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 9283 "FacebookPublishing.c"
+#line 7247 "FacebookPublishing.c"
 }
 
 
@@ -9333,81 +7281,81 @@ void publishing_facebook_graph_session_send_message (PublishingFacebookGraphSess
 	gchar* _tmp9_ = NULL;
 	PublishingFacebookGraphSessionGraphMessageImpl* _tmp10_ = NULL;
 	gboolean _tmp11_ = FALSE;
-#line 1546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self));
-#line 1546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
-#line 1547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = message;
-#line 1547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1288 "/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 1547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	real_message = _tmp1_;
-#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = real_message;
-#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = _tmp2_->soup_message;
-#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = soup_message_get_uri (_tmp3_);
-#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = _tmp4_;
-#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = soup_uri_to_string (_tmp5_, FALSE);
-#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = _tmp6_;
-#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = g_strconcat ("making HTTP request to URI: ", _tmp7_, NULL);
-#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp9_ = _tmp8_;
-#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"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:1290: %s", _tmp9_);
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp9_);
-#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp7_);
-#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = real_message;
-#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp11_ = publishing_facebook_graph_session_graph_message_impl_prepare_for_transmission (_tmp10_);
-#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp11_) {
-#line 9339 "FacebookPublishing.c"
+#line 7303 "FacebookPublishing.c"
 		PublishingFacebookGraphMessage* _tmp12_ = NULL;
 		SoupSession* _tmp13_ = NULL;
 		PublishingFacebookGraphSessionGraphMessageImpl* _tmp14_ = NULL;
 		SoupMessage* _tmp15_ = NULL;
 		SoupMessage* _tmp16_ = NULL;
-#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp12_ = message;
-#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_session_manage_message (self, _tmp12_);
-#line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp13_ = self->priv->soup_session;
-#line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp14_ = real_message;
-#line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp15_ = _tmp14_->soup_message;
-#line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp16_ = _g_object_ref0 (_tmp15_);
-#line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		soup_session_queue_message (_tmp13_, _tmp16_, NULL, NULL);
-#line 9359 "FacebookPublishing.c"
+#line 7323 "FacebookPublishing.c"
 	}
-#line 1546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (real_message);
-#line 9363 "FacebookPublishing.c"
+#line 7327 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_graph_session_stop_transactions (PublishingFacebookGraphSession* self) {
 	SoupSession* _tmp0_ = NULL;
-#line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self));
-#line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->soup_session;
-#line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	soup_session_abort (_tmp0_);
-#line 9375 "FacebookPublishing.c"
+#line 7339 "FacebookPublishing.c"
 }
 
 
@@ -9421,39 +7369,39 @@ static PublishingFacebookGraphSessionGraphMessageImpl* publishing_facebook_graph
 	PublishingFacebookEndpoint _tmp4_ = 0;
 	gchar* _tmp5_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (host_session), NULL);
-#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (relative_uri != NULL, NULL);
-#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (access_token != NULL, NULL);
-#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = (PublishingFacebookGraphSessionGraphMessageImpl*) publishing_facebook_graph_message_construct (object_type);
-#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = method;
-#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->method = _tmp0_;
-#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = access_token;
-#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->access_token);
-#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->access_token = _tmp2_;
-#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = host_session;
-#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->host_session = _tmp3_;
-#line 1266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->bytes_so_far = 0;
-#line 1268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = endpoint;
-#line 1268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = publishing_facebook_endpoint_to_uri (_tmp4_);
-#line 1268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	endpoint_uri = _tmp5_;
-#line 9421 "FacebookPublishing.c"
+#line 7385 "FacebookPublishing.c"
 	{
 		GRegex* starting_slashes = NULL;
 		GRegex* _tmp6_ = NULL;
@@ -9465,129 +7413,129 @@ static PublishingFacebookGraphSessionGraphMessageImpl* publishing_facebook_graph
 		gchar* _tmp12_ = NULL;
 		gchar* _tmp13_ = NULL;
 		gchar* _tmp14_ = NULL;
-#line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp6_ = g_regex_new ("^/+", 0, 0, &_inner_error_);
-#line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		starting_slashes = _tmp6_;
-#line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 9441 "FacebookPublishing.c"
-				goto __catch5_g_regex_error;
+#line 7405 "FacebookPublishing.c"
+				goto __catch4_g_regex_error;
 			}
-#line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_free0 (endpoint_uri);
-#line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1014 "/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 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return NULL;
-#line 9452 "FacebookPublishing.c"
+#line 7416 "FacebookPublishing.c"
 		}
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp8_ = starting_slashes;
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp9_ = relative_uri;
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp10_ = g_regex_replace (_tmp8_, _tmp9_, (gssize) -1, 0, "", 0, &_inner_error_);
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp7_ = _tmp10_;
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_regex_unref0 (starting_slashes);
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 9468 "FacebookPublishing.c"
-				goto __catch5_g_regex_error;
+#line 7432 "FacebookPublishing.c"
+				goto __catch4_g_regex_error;
 			}
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_regex_unref0 (starting_slashes);
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_free0 (endpoint_uri);
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1015 "/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 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return NULL;
-#line 9481 "FacebookPublishing.c"
+#line 7445 "FacebookPublishing.c"
 		}
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp11_ = endpoint_uri;
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp12_ = _tmp7_;
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp7_ = NULL;
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp13_ = _tmp12_;
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp14_ = g_strconcat (_tmp11_, _tmp13_, NULL);
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (self->uri);
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		self->uri = _tmp14_;
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp13_);
-#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp7_);
-#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_regex_unref0 (starting_slashes);
-#line 9503 "FacebookPublishing.c"
+#line 7467 "FacebookPublishing.c"
 	}
-	goto __finally5;
-	__catch5_g_regex_error:
+	goto __finally4;
+	__catch4_g_regex_error:
 	{
 		GError* err = NULL;
-#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		err = _inner_error_;
-#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_inner_error_ = NULL;
-#line 1273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1017 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_assert_not_reached ();
-#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_error_free0 (err);
-#line 9517 "FacebookPublishing.c"
+#line 7481 "FacebookPublishing.c"
 	}
-	__finally5:
-#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	__finally4:
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (endpoint_uri);
-#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1013 "/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 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return NULL;
-#line 9530 "FacebookPublishing.c"
+#line 7494 "FacebookPublishing.c"
 	}
-#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (endpoint_uri);
-#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 9536 "FacebookPublishing.c"
+#line 7500 "FacebookPublishing.c"
 }
 
 
 static gboolean publishing_facebook_graph_session_graph_message_impl_real_prepare_for_transmission (PublishingFacebookGraphSessionGraphMessageImpl* self) {
 	gboolean result = FALSE;
-#line 1278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = TRUE;
-#line 1278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 9546 "FacebookPublishing.c"
+#line 7510 "FacebookPublishing.c"
 }
 
 
 gboolean publishing_facebook_graph_session_graph_message_impl_prepare_for_transmission (PublishingFacebookGraphSessionGraphMessageImpl* self) {
-#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1021 "/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 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1021 "/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 9555 "FacebookPublishing.c"
+#line 7519 "FacebookPublishing.c"
 }
 
 
@@ -9596,17 +7544,17 @@ static gchar* publishing_facebook_graph_session_graph_message_impl_real_get_uri
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1025 "/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 1282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->uri;
-#line 1282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp1_;
-#line 1282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 9574 "FacebookPublishing.c"
+#line 7538 "FacebookPublishing.c"
 }
 
 
@@ -9618,23 +7566,23 @@ static gchar* publishing_facebook_graph_session_graph_message_impl_real_get_resp
 	guint8* _tmp2_ = NULL;
 	gint _tmp2__length1 = 0;
 	gchar* _tmp3_ = NULL;
-#line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1029 "/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 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->soup_message;
-#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = _tmp0_->response_body;
-#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = _tmp1_->data;
-#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2__length1 = (gint) _tmp1_->length;
-#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = g_strdup ((const gchar*) _tmp2_);
-#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp3_;
-#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 9602 "FacebookPublishing.c"
+#line 7566 "FacebookPublishing.c"
 }
 
 
@@ -9646,44 +7594,44 @@ static void publishing_facebook_graph_session_graph_message_impl_on_wrote_body_d
 	SoupMessage* _tmp4_ = NULL;
 	SoupMessageBody* _tmp5_ = NULL;
 	gint64 _tmp6_ = 0LL;
-#line 1289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_GRAPH_SESSION_IS_GRAPH_MESSAGE_IMPL (self));
-#line 1289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (chunk != NULL);
-#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->bytes_so_far;
-#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = chunk;
-#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = _tmp1_->length;
-#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->bytes_so_far = _tmp0_ + ((gint) _tmp2_);
-#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = self->bytes_so_far;
-#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = self->soup_message;
-#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = _tmp4_->request_body;
-#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = _tmp5_->length;
-#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1036 "/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 9636 "FacebookPublishing.c"
+#line 7600 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_graph_session_graph_message_impl_class_init (PublishingFacebookGraphSessionGraphMessageImplClass * klass) {
-#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 997 "/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 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookGraphMessageClass *) klass)->finalize = publishing_facebook_graph_session_graph_message_impl_finalize;
-#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 997 "/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 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookGraphMessageClass *) klass)->get_uri = publishing_facebook_graph_session_graph_message_impl_real_get_uri;
-#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 997 "/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 9651 "FacebookPublishing.c"
+#line 7615 "FacebookPublishing.c"
 }
 
 
@@ -9693,17 +7641,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 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 997 "/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 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->uri);
-#line 1256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->access_token);
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->soup_message);
-#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 997 "/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 9671 "FacebookPublishing.c"
+#line 7635 "FacebookPublishing.c"
 }
 
 
@@ -9720,9 +7668,9 @@ static GType publishing_facebook_graph_session_graph_message_impl_get_type (void
 
 
 static void _vala_SoupURI_free (SoupURI* self) {
-#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_boxed_free (soup_uri_get_type (), self);
-#line 9690 "FacebookPublishing.c"
+#line 7654 "FacebookPublishing.c"
 }
 
 
@@ -9745,79 +7693,79 @@ static PublishingFacebookGraphSessionGraphQueryMessage* publishing_facebook_grap
 	gchar* _tmp13_ = NULL;
 	SoupMessage* _tmp14_ = NULL;
 	SoupMessage* _tmp15_ = NULL;
-#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (host_session), NULL);
-#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (relative_uri != NULL, NULL);
-#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (access_token != NULL, NULL);
-#line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = host_session;
-#line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = relative_uri;
-#line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = access_token;
-#line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1043 "/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 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1045 "/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 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = g_strconcat (_tmp3_, "?access_token=", NULL);
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = _tmp4_;
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = access_token;
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = g_strconcat (_tmp5_, _tmp6_, NULL);
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = _tmp7_;
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp9_ = soup_uri_new (_tmp8_);
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = _tmp9_;
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp8_);
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp5_);
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	destination_uri = _tmp10_;
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1046 "/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 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp12_ = publishing_rest_support_http_method_to_string (_tmp11_);
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp13_ = _tmp12_;
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp14_ = soup_message_new_from_uri (_tmp13_, destination_uri);
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1046 "/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 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1046 "/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 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp13_);
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1047 "/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 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1047 "/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 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	__vala_SoupURI_free0 (destination_uri);
-#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 9771 "FacebookPublishing.c"
+#line 7735 "FacebookPublishing.c"
 }
 
 
 static PublishingFacebookGraphSessionGraphQueryMessage* publishing_facebook_graph_session_graph_query_message_new (PublishingFacebookGraphSession* host_session, const gchar* relative_uri, const gchar* access_token) {
-#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1041 "/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 9778 "FacebookPublishing.c"
+#line 7742 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_graph_session_graph_query_message_class_init (PublishingFacebookGraphSessionGraphQueryMessageClass * klass) {
-#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1040 "/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 9785 "FacebookPublishing.c"
+#line 7749 "FacebookPublishing.c"
 }
 
 
@@ -9848,55 +7796,55 @@ static PublishingFacebookGraphSessionGraphEndpointProbeMessage* publishing_faceb
 	SoupURI* _tmp6_ = NULL;
 	SoupMessage* _tmp7_ = NULL;
 	SoupMessage* _tmp8_ = NULL;
-#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (host_session), NULL);
-#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1053 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = host_session;
-#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1053 "/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 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1056 "/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 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = publishing_rest_support_http_method_to_string (_tmp1_);
-#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = _tmp2_;
-#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1056 "/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 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = soup_uri_new (_tmp4_);
-#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = _tmp5_;
-#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = soup_message_new_from_uri (_tmp3_, _tmp6_);
-#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1056 "/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 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1056 "/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 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	__vala_SoupURI_free0 (_tmp6_);
-#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp3_);
-#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1057 "/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 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1057 "/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 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 9850 "FacebookPublishing.c"
+#line 7814 "FacebookPublishing.c"
 }
 
 
 static PublishingFacebookGraphSessionGraphEndpointProbeMessage* publishing_facebook_graph_session_graph_endpoint_probe_message_new (PublishingFacebookGraphSession* host_session) {
-#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1052 "/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 9857 "FacebookPublishing.c"
+#line 7821 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_graph_session_graph_endpoint_probe_message_class_init (PublishingFacebookGraphSessionGraphEndpointProbeMessageClass * klass) {
-#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1051 "/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 9864 "FacebookPublishing.c"
+#line 7828 "FacebookPublishing.c"
 }
 
 
@@ -9927,21 +7875,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 9895 "FacebookPublishing.c"
+#line 7859 "FacebookPublishing.c"
 }
 
 
 static void _vala_SoupMultipart_free (SoupMultipart* self) {
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_boxed_free (soup_multipart_get_type (), self);
-#line 9902 "FacebookPublishing.c"
+#line 7866 "FacebookPublishing.c"
 }
 
 
 static void _vala_SoupBuffer_free (SoupBuffer* self) {
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_boxed_free (soup_buffer_get_type (), self);
-#line 9909 "FacebookPublishing.c"
+#line 7873 "FacebookPublishing.c"
 }
 
 
@@ -10014,64 +7962,64 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra
 	SoupMessage* _tmp79_ = NULL;
 	SoupMessageBody* _tmp80_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (host_session), NULL);
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (access_token != NULL, NULL);
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (relative_uri != NULL, NULL);
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = publishable;
-#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = spit_publishing_publishable_get_media_type (_tmp1_);
-#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp2_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = PUBLISHING_FACEBOOK_ENDPOINT_VIDEO;
-#line 9998 "FacebookPublishing.c"
+#line 7962 "FacebookPublishing.c"
 	} else {
-#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = PUBLISHING_FACEBOOK_ENDPOINT_DEFAULT;
-#line 10002 "FacebookPublishing.c"
+#line 7966 "FacebookPublishing.c"
 	}
-#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = host_session;
-#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = relative_uri;
-#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = access_token;
-#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1068 "/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 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = publishable;
-#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = spit_publishing_publishable_get_media_type (_tmp7_);
-#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp8_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp6_ = TRUE;
-#line 10020 "FacebookPublishing.c"
+#line 7984 "FacebookPublishing.c"
 	} else {
 		const gchar* _tmp9_ = NULL;
-#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp9_ = resource_privacy;
-#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp6_ = _tmp9_ != NULL;
-#line 10027 "FacebookPublishing.c"
+#line 7991 "FacebookPublishing.c"
 	}
-#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1075 "/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 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = publishable;
-#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp11_ = _g_object_ref0 (_tmp10_);
-#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->publishable);
-#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->publishable = _tmp11_;
-#line 10039 "FacebookPublishing.c"
+#line 8003 "FacebookPublishing.c"
 	{
 		GMappedFile* _tmp12_ = NULL;
 		SpitPublishingPublishable* _tmp13_ = NULL;
@@ -10082,330 +8030,330 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra
 		GMappedFile* _tmp18_ = NULL;
 		GMappedFile* _tmp19_ = NULL;
 		GMappedFile* _tmp20_ = NULL;
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp13_ = publishable;
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp14_ = spit_publishing_publishable_get_serialized_file (_tmp13_);
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp15_ = _tmp14_;
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp16_ = g_file_get_path (_tmp15_);
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp17_ = _tmp16_;
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp18_ = g_mapped_file_new (_tmp17_, FALSE, &_inner_error_);
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp19_ = _tmp18_;
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp17_);
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_object_unref0 (_tmp15_);
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp12_ = _tmp19_;
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			if (_inner_error_->domain == G_FILE_ERROR) {
-#line 10074 "FacebookPublishing.c"
-				goto __catch6_g_file_error;
+#line 8038 "FacebookPublishing.c"
+				goto __catch5_g_file_error;
 			}
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/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 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return NULL;
-#line 10083 "FacebookPublishing.c"
+#line 8047 "FacebookPublishing.c"
 		}
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp20_ = _tmp12_;
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp12_ = NULL;
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_mapped_file_unref0 (self->priv->mapped_file);
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		self->priv->mapped_file = _tmp20_;
-#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_mapped_file_unref0 (_tmp12_);
-#line 10095 "FacebookPublishing.c"
+#line 8059 "FacebookPublishing.c"
 	}
-	goto __finally6;
-	__catch6_g_file_error:
+	goto __finally5;
+	__catch5_g_file_error:
 	{
 		GError* e = NULL;
-#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		e = _inner_error_;
-#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_inner_error_ = NULL;
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_error_free0 (e);
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return self;
-#line 10109 "FacebookPublishing.c"
+#line 8073 "FacebookPublishing.c"
 	}
-	__finally6:
-#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	__finally5:
+#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1081 "/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 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return NULL;
-#line 10120 "FacebookPublishing.c"
+#line 8084 "FacebookPublishing.c"
 	}
-#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1088 "/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 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp22_ = publishing_rest_support_http_method_to_string (_tmp21_);
-#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp23_ = _tmp22_;
-#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1088 "/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 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp25_ = soup_uri_new (_tmp24_);
-#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp26_ = _tmp25_;
-#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp27_ = soup_message_new_from_uri (_tmp23_, _tmp26_);
-#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1088 "/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 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1088 "/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 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	__vala_SoupURI_free0 (_tmp26_);
-#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp23_);
-#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1089 "/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 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1089 "/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 1347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp29_ = self->priv->mapped_file;
-#line 1347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp30_ = g_mapped_file_get_contents (_tmp29_);
-#line 1347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	payload = (guint8*) _tmp30_;
-#line 1347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	payload_length1 = -1;
-#line 1347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_payload_size_ = payload_length1;
-#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp31_ = self->priv->mapped_file;
-#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp32_ = g_mapped_file_get_length (_tmp31_);
-#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	payload_length1 = (gint) _tmp32_;
-#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp33_ = payload_length1;
-#line 1350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp34_ = payload;
-#line 1350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp34__length1 = payload_length1;
-#line 1350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp35_ = soup_buffer_new (SOUP_MEMORY_TEMPORARY, _tmp34_, _tmp34__length1);
-#line 1350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	image_data = _tmp35_;
-#line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1096 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp36_ = soup_multipart_new ("multipart/form-data");
-#line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1096 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	mp_envelope = _tmp36_;
-#line 1354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp37_ = mp_envelope;
-#line 1354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp38_ = access_token;
-#line 1354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	soup_multipart_append_form_string (_tmp37_, "access_token", _tmp38_);
-#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp39_ = publishable;
-#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp40_ = spit_publishing_publishable_get_media_type (_tmp39_);
-#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp40_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 10190 "FacebookPublishing.c"
+#line 8154 "FacebookPublishing.c"
 		SoupMultipart* _tmp41_ = NULL;
 		const gchar* _tmp42_ = NULL;
-#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp41_ = mp_envelope;
-#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp42_ = resource_privacy;
-#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		soup_multipart_append_form_string (_tmp41_, "privacy", _tmp42_);
-#line 10199 "FacebookPublishing.c"
+#line 8163 "FacebookPublishing.c"
 	}
-#line 1360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp43_ = publishable;
-#line 1360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp44_ = spit_publishing_publishable_get_param_string (_tmp43_, "title");
-#line 1360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishable_title = _tmp44_;
-#line 1361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp46_ = suppress_titling;
-#line 1361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp46_) {
-#line 10211 "FacebookPublishing.c"
+#line 8175 "FacebookPublishing.c"
 		const gchar* _tmp47_ = NULL;
-#line 1361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp47_ = publishable_title;
-#line 1361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp45_ = _tmp47_ != NULL;
-#line 10217 "FacebookPublishing.c"
+#line 8181 "FacebookPublishing.c"
 	} else {
-#line 1361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp45_ = FALSE;
-#line 10221 "FacebookPublishing.c"
+#line 8185 "FacebookPublishing.c"
 	}
-#line 1361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp45_) {
-#line 10225 "FacebookPublishing.c"
+#line 8189 "FacebookPublishing.c"
 		SoupMultipart* _tmp48_ = NULL;
 		const gchar* _tmp49_ = NULL;
-#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp48_ = mp_envelope;
-#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp49_ = publishable_title;
-#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		soup_multipart_append_form_string (_tmp48_, "name", _tmp49_);
-#line 10234 "FacebookPublishing.c"
+#line 8198 "FacebookPublishing.c"
 	}
-#line 1365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp50_ = publishable;
-#line 1365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp51_ = spit_publishing_publishable_get_param_string (_tmp50_, "comment");
-#line 1365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishable_comment = _tmp51_;
-#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp53_ = suppress_titling;
-#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp53_) {
-#line 10246 "FacebookPublishing.c"
+#line 8210 "FacebookPublishing.c"
 		const gchar* _tmp54_ = NULL;
-#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp54_ = publishable_comment;
-#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp52_ = _tmp54_ != NULL;
-#line 10252 "FacebookPublishing.c"
+#line 8216 "FacebookPublishing.c"
 	} else {
-#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp52_ = FALSE;
-#line 10256 "FacebookPublishing.c"
+#line 8220 "FacebookPublishing.c"
 	}
-#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp52_) {
-#line 10260 "FacebookPublishing.c"
+#line 8224 "FacebookPublishing.c"
 		SoupMultipart* _tmp55_ = NULL;
 		const gchar* _tmp56_ = NULL;
-#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp55_ = mp_envelope;
-#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp56_ = publishable_comment;
-#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		soup_multipart_append_form_string (_tmp55_, "message", _tmp56_);
-#line 10269 "FacebookPublishing.c"
+#line 8233 "FacebookPublishing.c"
 	}
-#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp57_ = suppress_titling;
-#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp57_) {
-#line 10275 "FacebookPublishing.c"
+#line 8239 "FacebookPublishing.c"
 		SoupMultipart* _tmp58_ = NULL;
 		SpitPublishingPublishable* _tmp59_ = NULL;
 		GDateTime* _tmp60_ = NULL;
 		GDateTime* _tmp61_ = NULL;
 		gchar* _tmp62_ = NULL;
 		gchar* _tmp63_ = NULL;
-#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp58_ = mp_envelope;
-#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp59_ = publishable;
-#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp60_ = spit_publishing_publishable_get_exposure_date_time (_tmp59_);
-#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp61_ = _tmp60_;
-#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp62_ = g_date_time_to_string (_tmp61_);
-#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp63_ = _tmp62_;
-#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		soup_multipart_append_form_string (_tmp58_, "backdated_time", _tmp63_);
-#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp63_);
-#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_date_time_unref0 (_tmp61_);
-#line 10300 "FacebookPublishing.c"
+#line 8264 "FacebookPublishing.c"
 	}
-#line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp65_ = publishable;
-#line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp66_ = spit_publishing_publishable_get_media_type (_tmp65_);
-#line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp66_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp64_ = "video";
-#line 10310 "FacebookPublishing.c"
+#line 8274 "FacebookPublishing.c"
 	} else {
-#line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp64_ = "image/jpeg";
-#line 10314 "FacebookPublishing.c"
+#line 8278 "FacebookPublishing.c"
 	}
-#line 1373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp67_ = g_strdup (_tmp64_);
-#line 1373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	source_file_mime_type = _tmp67_;
-#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp68_ = mp_envelope;
-#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp69_ = publishable;
-#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp70_ = spit_publishing_publishable_get_serialized_file (_tmp69_);
-#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp71_ = _tmp70_;
-#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp72_ = g_file_get_basename (_tmp71_);
-#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp73_ = _tmp72_;
-#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp74_ = source_file_mime_type;
-#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp75_ = image_data;
-#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	soup_multipart_append_form_file (_tmp68_, "source", _tmp73_, _tmp74_, _tmp75_);
-#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp73_);
-#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (_tmp71_);
-#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp76_ = mp_envelope;
-#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1123 "/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 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp78_ = _tmp77_->request_headers;
-#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1123 "/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 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp80_ = _tmp79_->request_body;
-#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	soup_multipart_to_message (_tmp76_, _tmp78_, _tmp80_);
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (source_file_mime_type);
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (publishable_comment);
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (publishable_title);
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	__vala_SoupMultipart_free0 (mp_envelope);
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	__vala_SoupBuffer_free0 (image_data);
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 10366 "FacebookPublishing.c"
+#line 8330 "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 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1065 "/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 10373 "FacebookPublishing.c"
+#line 8337 "FacebookPublishing.c"
 }
 
 
@@ -10413,13 +8361,13 @@ static gboolean publishing_facebook_graph_session_graph_upload_message_real_prep
 	PublishingFacebookGraphSessionGraphUploadMessage * self;
 	gboolean result = FALSE;
 	GMappedFile* _tmp0_ = NULL;
-#line 1382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1126 "/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 1383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->mapped_file;
-#line 1383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 10387 "FacebookPublishing.c"
+#line 8351 "FacebookPublishing.c"
 		SpitPublishingPublishable* _tmp1_ = NULL;
 		GFile* _tmp2_ = NULL;
 		GFile* _tmp3_ = NULL;
@@ -10429,82 +8377,82 @@ static gboolean publishing_facebook_graph_session_graph_upload_message_real_prep
 		gchar* _tmp7_ = NULL;
 		GError* _tmp8_ = NULL;
 		GError* _tmp9_ = NULL;
-#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp1_ = self->priv->publishable;
-#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp2_ = spit_publishing_publishable_get_serialized_file (_tmp1_);
-#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp3_ = _tmp2_;
-#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp4_ = g_file_get_path (_tmp3_);
-#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp5_ = _tmp4_;
-#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp6_ = g_strdup_printf ("File %s is unavailable.", _tmp5_);
-#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp7_ = _tmp6_;
-#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1128 "/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 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp9_ = _tmp8_;
-#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1128 "/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 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_error_free0 (_tmp9_);
-#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp7_);
-#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp5_);
-#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_object_unref0 (_tmp3_);
-#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		result = FALSE;
-#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return result;
-#line 10429 "FacebookPublishing.c"
+#line 8393 "FacebookPublishing.c"
 	} else {
-#line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		result = TRUE;
-#line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return result;
-#line 10435 "FacebookPublishing.c"
+#line 8399 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_graph_session_graph_upload_message_class_init (PublishingFacebookGraphSessionGraphUploadMessageClass * klass) {
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1061 "/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 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookGraphMessageClass *) klass)->finalize = publishing_facebook_graph_session_graph_upload_message_finalize;
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFacebookGraphSessionGraphUploadMessagePrivate));
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1061 "/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 10449 "FacebookPublishing.c"
+#line 8413 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_graph_session_graph_upload_message_instance_init (PublishingFacebookGraphSessionGraphUploadMessage * self) {
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv = PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_UPLOAD_MESSAGE_GET_PRIVATE (self);
-#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1062 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->mapped_file = NULL;
-#line 10458 "FacebookPublishing.c"
+#line 8422 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_graph_session_graph_upload_message_finalize (PublishingFacebookGraphMessage* obj) {
 	PublishingFacebookGraphSessionGraphUploadMessage * self;
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1061 "/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 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1062 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_mapped_file_unref0 (self->priv->mapped_file);
-#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->publishable);
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1061 "/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 10472 "FacebookPublishing.c"
+#line 8436 "FacebookPublishing.c"
 }
 
 
@@ -10542,105 +8490,105 @@ static PublishingFacebookGraphSessionGraphCreateAlbumMessage* publishing_faceboo
 	SoupMessageHeaders* _tmp17_ = NULL;
 	SoupMessage* _tmp18_ = NULL;
 	SoupMessageBody* _tmp19_ = NULL;
-#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (host_session), NULL);
-#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (access_token != NULL, NULL);
-#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (album_name != NULL, NULL);
-#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (album_privacy != NULL, NULL);
-#line 1396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = host_session;
-#line 1396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = access_token;
-#line 1396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1140 "/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 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = album_privacy;
-#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp3_ != NULL) {
-#line 10528 "FacebookPublishing.c"
+#line 8492 "FacebookPublishing.c"
 		const gchar* _tmp4_ = NULL;
-#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp4_ = album_privacy;
-#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp2_ = g_strcmp0 (_tmp4_, "") != 0;
-#line 10534 "FacebookPublishing.c"
+#line 8498 "FacebookPublishing.c"
 	} else {
-#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp2_ = FALSE;
-#line 10538 "FacebookPublishing.c"
+#line 8502 "FacebookPublishing.c"
 	}
-#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_assert (_tmp2_, "album_privacy != null && album_privacy != \"\"");
-#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1144 "/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 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = publishing_rest_support_http_method_to_string (_tmp5_);
-#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = _tmp6_;
-#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1144 "/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 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp9_ = soup_uri_new (_tmp8_);
-#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = _tmp9_;
-#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp11_ = soup_message_new_from_uri (_tmp7_, _tmp10_);
-#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1144 "/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 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1144 "/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 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	__vala_SoupURI_free0 (_tmp10_);
-#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp7_);
-#line 1402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp12_ = soup_multipart_new ("multipart/form-data");
-#line 1402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	mp_envelope = _tmp12_;
-#line 1404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp13_ = access_token;
-#line 1404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	soup_multipart_append_form_string (mp_envelope, "access_token", _tmp13_);
-#line 1405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp14_ = album_name;
-#line 1405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	soup_multipart_append_form_string (mp_envelope, "name", _tmp14_);
-#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp15_ = album_privacy;
-#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	soup_multipart_append_form_string (mp_envelope, "privacy", _tmp15_);
-#line 1408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1152 "/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 1408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp17_ = _tmp16_->request_headers;
-#line 1408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1152 "/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 1408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp19_ = _tmp18_->request_body;
-#line 1408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	soup_multipart_to_message (mp_envelope, _tmp17_, _tmp19_);
-#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	__vala_SoupMultipart_free0 (mp_envelope);
-#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 10594 "FacebookPublishing.c"
+#line 8558 "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 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1138 "/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 10601 "FacebookPublishing.c"
+#line 8565 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_graph_session_graph_create_album_message_class_init (PublishingFacebookGraphSessionGraphCreateAlbumMessageClass * klass) {
-#line 1393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1137 "/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 10608 "FacebookPublishing.c"
+#line 8572 "FacebookPublishing.c"
 }
 
 
@@ -10661,204 +8609,204 @@ static GType publishing_facebook_graph_session_graph_create_album_message_get_ty
 
 
 static void publishing_facebook_value_graph_session_init (GValue* value) {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 10631 "FacebookPublishing.c"
+#line 8595 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_value_graph_session_free_value (GValue* value) {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_session_unref (value->data[0].v_pointer);
-#line 10640 "FacebookPublishing.c"
+#line 8604 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_value_graph_session_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/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 10650 "FacebookPublishing.c"
+#line 8614 "FacebookPublishing.c"
 	} else {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 10654 "FacebookPublishing.c"
+#line 8618 "FacebookPublishing.c"
 	}
 }
 
 
 static gpointer publishing_facebook_value_graph_session_peek_pointer (const GValue* value) {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 10662 "FacebookPublishing.c"
+#line 8626 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_value_graph_session_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 10669 "FacebookPublishing.c"
+#line 8633 "FacebookPublishing.c"
 		PublishingFacebookGraphSession* object;
 		object = collect_values[0].v_pointer;
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/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 10676 "FacebookPublishing.c"
+#line 8640 "FacebookPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/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 10680 "FacebookPublishing.c"
+#line 8644 "FacebookPublishing.c"
 		}
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = publishing_facebook_graph_session_ref (object);
-#line 10684 "FacebookPublishing.c"
+#line 8648 "FacebookPublishing.c"
 	} else {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 10688 "FacebookPublishing.c"
+#line 8652 "FacebookPublishing.c"
 	}
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 10692 "FacebookPublishing.c"
+#line 8656 "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 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!object_p) {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/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 10703 "FacebookPublishing.c"
+#line 8667 "FacebookPublishing.c"
 	}
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = NULL;
-#line 10709 "FacebookPublishing.c"
+#line 8673 "FacebookPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 10713 "FacebookPublishing.c"
+#line 8677 "FacebookPublishing.c"
 	} else {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = publishing_facebook_graph_session_ref (value->data[0].v_pointer);
-#line 10717 "FacebookPublishing.c"
+#line 8681 "FacebookPublishing.c"
 	}
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 10721 "FacebookPublishing.c"
+#line 8685 "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 1252 "/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 (g_type_is_a (object_type, PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION), NULL);
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 10735 "FacebookPublishing.c"
+#line 8699 "FacebookPublishing.c"
 }
 
 
 gpointer publishing_facebook_value_get_graph_session (const GValue* value) {
-#line 1252 "/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 (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION), NULL);
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 10744 "FacebookPublishing.c"
+#line 8708 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_value_set_graph_session (GValue* value, gpointer v_object) {
 	PublishingFacebookGraphSession* old;
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/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 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (v_object) {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/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 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/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 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_session_ref (value->data[0].v_pointer);
-#line 10764 "FacebookPublishing.c"
+#line 8728 "FacebookPublishing.c"
 	} else {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 10768 "FacebookPublishing.c"
+#line 8732 "FacebookPublishing.c"
 	}
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_session_unref (old);
-#line 10774 "FacebookPublishing.c"
+#line 8738 "FacebookPublishing.c"
 	}
 }
 
 
 void publishing_facebook_value_take_graph_session (GValue* value, gpointer v_object) {
 	PublishingFacebookGraphSession* old;
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/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 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (v_object) {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/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 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/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 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 10793 "FacebookPublishing.c"
+#line 8757 "FacebookPublishing.c"
 	} else {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 10797 "FacebookPublishing.c"
+#line 8761 "FacebookPublishing.c"
 	}
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_session_unref (old);
-#line 10803 "FacebookPublishing.c"
+#line 8767 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_graph_session_class_init (PublishingFacebookGraphSessionClass * klass) {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_session_parent_class = g_type_class_peek_parent (klass);
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookGraphSessionClass *) klass)->finalize = publishing_facebook_graph_session_finalize;
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFacebookGraphSessionPrivate));
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/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 10817 "FacebookPublishing.c"
+#line 8781 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_graph_session_instance_init (PublishingFacebookGraphSession * self) {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv = PUBLISHING_FACEBOOK_GRAPH_SESSION_GET_PRIVATE (self);
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->ref_count = 1;
-#line 10826 "FacebookPublishing.c"
+#line 8790 "FacebookPublishing.c"
 }
 
 
@@ -10866,23 +8814,23 @@ static void publishing_facebook_graph_session_finalize (PublishingFacebookGraphS
 	PublishingFacebookGraphSession * self;
 	SoupSession* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION, PublishingFacebookGraphSession);
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 1428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->soup_session;
-#line 1428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("request-unqueued", soup_session_get_type (), &_tmp1_, NULL, FALSE);
-#line 1428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1172 "/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 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1158 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->soup_session);
-#line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->priv->access_token);
-#line 1416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (self->priv->current_message);
-#line 10850 "FacebookPublishing.c"
+#line 8814 "FacebookPublishing.c"
 }
 
 
@@ -10903,24 +8851,24 @@ GType publishing_facebook_graph_session_get_type (void) {
 gpointer publishing_facebook_graph_session_ref (gpointer instance) {
 	PublishingFacebookGraphSession* self;
 	self = instance;
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return instance;
-#line 10875 "FacebookPublishing.c"
+#line 8839 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_graph_session_unref (gpointer instance) {
 	PublishingFacebookGraphSession* self;
 	self = instance;
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		PUBLISHING_FACEBOOK_GRAPH_SESSION_GET_CLASS (self)->finalize (self);
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 10888 "FacebookPublishing.c"
+#line 8852 "FacebookPublishing.c"
 	}
 }
 
@@ -10928,35 +8876,35 @@ void publishing_facebook_graph_session_unref (gpointer instance) {
 static SpitPublishingPublishable** _vala_array_dup3 (SpitPublishingPublishable** self, int length) {
 	SpitPublishingPublishable** result;
 	int i;
-#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = g_new0 (SpitPublishingPublishable*, length + 1);
-#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 10900 "FacebookPublishing.c"
+#line 8864 "FacebookPublishing.c"
 		SpitPublishingPublishable* _tmp0_ = NULL;
-#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
-#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		result[i] = _tmp0_;
-#line 10906 "FacebookPublishing.c"
+#line 8870 "FacebookPublishing.c"
 	}
-#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 10910 "FacebookPublishing.c"
+#line 8874 "FacebookPublishing.c"
 }
 
 
 static gpointer _publishing_facebook_graph_session_ref0 (gpointer self) {
-#line 1576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? publishing_facebook_graph_session_ref (self) : NULL;
-#line 10917 "FacebookPublishing.c"
+#line 8881 "FacebookPublishing.c"
 }
 
 
 static gpointer _publishing_facebook_publishing_parameters_ref0 (gpointer self) {
-#line 1577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? publishing_facebook_publishing_parameters_ref (self) : NULL;
-#line 10924 "FacebookPublishing.c"
+#line 8888 "FacebookPublishing.c"
 }
 
 
@@ -10970,77 +8918,77 @@ PublishingFacebookUploader* publishing_facebook_uploader_construct (GType object
 	PublishingFacebookGraphSession* _tmp3_ = NULL;
 	PublishingFacebookPublishingParameters* _tmp4_ = NULL;
 	PublishingFacebookPublishingParameters* _tmp5_ = NULL;
-#line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (session), NULL);
-#line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_PARAMETERS (publishing_params), NULL);
-#line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = (PublishingFacebookUploader*) g_type_create_instance (object_type);
-#line 1574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->current_file = 0;
-#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = publishables;
-#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0__length1 = publishables_length1;
-#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup3 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
-#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1__length1 = _tmp0__length1;
-#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1316 "/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 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->publishables = _tmp1_;
-#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->publishables_length1 = _tmp1__length1;
-#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->_publishables_size_ = self->priv->publishables_length1;
-#line 1576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = session;
-#line 1576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = _publishing_facebook_graph_session_ref0 (_tmp2_);
-#line 1576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_session_unref0 (self->priv->session);
-#line 1576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->session = _tmp3_;
-#line 1577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = publishing_params;
-#line 1577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = _publishing_facebook_publishing_parameters_ref0 (_tmp4_);
-#line 1577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_publishing_parameters_unref0 (self->priv->publishing_params);
-#line 1577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->publishing_params = _tmp5_;
-#line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 10980 "FacebookPublishing.c"
+#line 8944 "FacebookPublishing.c"
 }
 
 
 PublishingFacebookUploader* publishing_facebook_uploader_new (PublishingFacebookGraphSession* session, PublishingFacebookPublishingParameters* publishing_params, SpitPublishingPublishable** publishables, int publishables_length1) {
-#line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1313 "/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 10987 "FacebookPublishing.c"
+#line 8951 "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 1599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_uploader_on_chunk_transmitted ((PublishingFacebookUploader*) self, bytes_sent_so_far, total_bytes);
-#line 10994 "FacebookPublishing.c"
+#line 8958 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_uploader_on_message_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender, gpointer self) {
-#line 1600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_uploader_on_message_completed ((PublishingFacebookUploader*) self, _sender);
-#line 11001 "FacebookPublishing.c"
+#line 8965 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_uploader_on_message_failed_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender, GError* err, gpointer self) {
-#line 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_uploader_on_message_failed ((PublishingFacebookUploader*) self, _sender, err);
-#line 11008 "FacebookPublishing.c"
+#line 8972 "FacebookPublishing.c"
 }
 
 
@@ -11078,167 +9026,167 @@ static void publishing_facebook_uploader_send_current_file (PublishingFacebookUp
 	PublishingFacebookGraphMessage* _tmp32_ = NULL;
 	PublishingFacebookGraphSession* _tmp33_ = NULL;
 	PublishingFacebookGraphMessage* _tmp34_ = NULL;
-#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (self));
-#line 1581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->publishables;
-#line 1581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0__length1 = self->priv->publishables_length1;
-#line 1581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->current_file;
-#line 1581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = _tmp0_[_tmp1_];
-#line 1581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 1581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishable = _tmp3_;
-#line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = publishable;
-#line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = spit_publishing_publishable_get_serialized_file (_tmp4_);
-#line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	file = _tmp5_;
-#line 1585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = file;
-#line 1585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp6_ == NULL) {
-#line 11070 "FacebookPublishing.c"
+#line 9034 "FacebookPublishing.c"
 		gint _tmp7_ = 0;
-#line 1586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp7_ = self->priv->current_file;
-#line 1586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		self->priv->current_file = _tmp7_ + 1;
-#line 1587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_object_unref0 (file);
-#line 1587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_object_unref0 (publishable);
-#line 1587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 11082 "FacebookPublishing.c"
+#line 9046 "FacebookPublishing.c"
 	}
-#line 1591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp9_ = publishable;
-#line 1591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = spit_publishing_publishable_get_media_type (_tmp9_);
-#line 1591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp10_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
-#line 11090 "FacebookPublishing.c"
+#line 9054 "FacebookPublishing.c"
 		PublishingFacebookPublishingParameters* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
 		gchar* _tmp13_ = NULL;
 		gchar* _tmp14_ = NULL;
-#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp11_ = self->priv->publishing_params;
-#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp12_ = publishing_facebook_publishing_parameters_get_target_album_id (_tmp11_);
-#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp13_ = _tmp12_;
-#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp14_ = g_strdup_printf ("/%s/photos", _tmp13_);
-#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp8_);
-#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp8_ = _tmp14_;
-#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp13_);
-#line 11109 "FacebookPublishing.c"
+#line 9073 "FacebookPublishing.c"
 	} else {
 		gchar* _tmp15_ = NULL;
-#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp15_ = g_strdup ("/me/videos");
-#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp8_);
-#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp8_ = _tmp15_;
-#line 11118 "FacebookPublishing.c"
+#line 9082 "FacebookPublishing.c"
 	}
-#line 1590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp16_ = g_strdup (_tmp8_);
-#line 1590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	resource_uri = _tmp16_;
-#line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp18_ = publishable;
-#line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp19_ = spit_publishing_publishable_get_media_type (_tmp18_);
-#line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp19_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 11130 "FacebookPublishing.c"
+#line 9094 "FacebookPublishing.c"
 		PublishingFacebookPublishingParameters* _tmp20_ = NULL;
 		const gchar* _tmp21_ = NULL;
-#line 1595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp20_ = self->priv->publishing_params;
-#line 1595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp21_ = _tmp20_->privacy_object;
-#line 1595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp17_ = _tmp21_;
-#line 11139 "FacebookPublishing.c"
+#line 9103 "FacebookPublishing.c"
 	} else {
-#line 1595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp17_ = NULL;
-#line 11143 "FacebookPublishing.c"
+#line 9107 "FacebookPublishing.c"
 	}
-#line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp22_ = g_strdup (_tmp17_);
-#line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	resource_privacy = _tmp22_;
-#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp23_ = self->priv->session;
-#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp24_ = resource_uri;
-#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp25_ = publishable;
-#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp26_ = self->priv->publishing_params;
-#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp27_ = _tmp26_->strip_metadata;
-#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp28_ = resource_privacy;
-#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp29_ = publishing_facebook_graph_session_new_upload (_tmp23_, _tmp24_, _tmp25_, _tmp27_, _tmp28_);
-#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	upload_message = _tmp29_;
-#line 1599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp30_ = upload_message;
-#line 1599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1340 "/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 1600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp31_ = upload_message;
-#line 1600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1341 "/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 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp32_ = upload_message;
-#line 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1342 "/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 1603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp33_ = self->priv->session;
-#line 1603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp34_ = upload_message;
-#line 1603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_session_send_message (_tmp33_, _tmp34_);
-#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (upload_message);
-#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (resource_privacy);
-#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (resource_uri);
-#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp8_);
-#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (file);
-#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (publishable);
-#line 11195 "FacebookPublishing.c"
+#line 9159 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_uploader_send_files (PublishingFacebookUploader* self) {
-#line 1606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (self));
-#line 1607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->current_file = 0;
-#line 1608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_uploader_send_current_file (self);
-#line 11206 "FacebookPublishing.c"
+#line 9170 "FacebookPublishing.c"
 }
 
 
@@ -11256,52 +9204,52 @@ static void publishing_facebook_uploader_on_chunk_transmitted (PublishingFaceboo
 	gdouble _tmp6_ = 0.0;
 	SpitPublishingProgressCallback _tmp7_ = NULL;
 	void* _tmp7__target = NULL;
-#line 1611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (self));
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->publishables;
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0__length1 = self->priv->publishables_length1;
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	file_span = 1.0 / _tmp0__length1;
-#line 1613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = bytes_written_so_far;
-#line 1613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = total_bytes;
-#line 1613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	this_file_fraction_complete = ((gdouble) _tmp1_) / _tmp2_;
-#line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = self->priv->current_file;
-#line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = file_span;
-#line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = this_file_fraction_complete;
-#line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = file_span;
-#line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	fraction_complete = (_tmp3_ * _tmp4_) + (_tmp5_ * _tmp6_);
-#line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = self->priv->status_updated;
-#line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7__target = self->priv->status_updated_target;
-#line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp7_ != NULL) {
-#line 11254 "FacebookPublishing.c"
+#line 9218 "FacebookPublishing.c"
 		SpitPublishingProgressCallback _tmp8_ = NULL;
 		void* _tmp8__target = NULL;
 		gint _tmp9_ = 0;
 		gdouble _tmp10_ = 0.0;
-#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp8_ = self->priv->status_updated;
-#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp8__target = self->priv->status_updated_target;
-#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp9_ = self->priv->current_file;
-#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp10_ = fraction_complete;
-#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp8_ (_tmp9_ + 1, _tmp10_, _tmp8__target);
-#line 11269 "FacebookPublishing.c"
+#line 9233 "FacebookPublishing.c"
 	}
 }
 
@@ -11317,50 +9265,50 @@ static void publishing_facebook_uploader_on_message_completed (PublishingFaceboo
 	gint _tmp7_ = 0;
 	SpitPublishingPublishable** _tmp8_ = NULL;
 	gint _tmp8__length1 = 0;
-#line 1621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (self));
-#line 1621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
-#line 1622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = message;
-#line 1622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("data-transmitted", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
-#line 1622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1363 "/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 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = message;
-#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp3_, NULL, FALSE);
-#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1364 "/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 1624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = message;
-#line 1624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp5_, NULL, FALSE);
-#line 1624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1365 "/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 1626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = self->priv->current_file;
-#line 1626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->current_file = _tmp6_ + 1;
-#line 1627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = self->priv->current_file;
-#line 1627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = self->priv->publishables;
-#line 1627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8__length1 = self->priv->publishables_length1;
-#line 1627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp7_ < _tmp8__length1) {
-#line 1628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_uploader_send_current_file (self);
-#line 11321 "FacebookPublishing.c"
+#line 9285 "FacebookPublishing.c"
 	} else {
 		gint _tmp9_ = 0;
-#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp9_ = self->priv->current_file;
-#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_signal_emit_by_name (self, "upload-complete", _tmp9_);
-#line 11328 "FacebookPublishing.c"
+#line 9292 "FacebookPublishing.c"
 	}
 }
 
@@ -11373,33 +9321,33 @@ static void publishing_facebook_uploader_on_message_failed (PublishingFacebookUp
 	PublishingFacebookGraphMessage* _tmp4_ = NULL;
 	guint _tmp5_ = 0U;
 	GError* _tmp6_ = NULL;
-#line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (self));
-#line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
-#line 1635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = message;
-#line 1635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("data-transmitted", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
-#line 1635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1376 "/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 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = message;
-#line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp3_, NULL, FALSE);
-#line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1377 "/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 1637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = message;
-#line 1637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp5_, NULL, FALSE);
-#line 1637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1378 "/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 1639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = _error_;
-#line 1639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_emit_by_name (self, "upload-error", _tmp6_);
-#line 11367 "FacebookPublishing.c"
+#line 9331 "FacebookPublishing.c"
 }
 
 
@@ -11408,248 +9356,248 @@ void publishing_facebook_uploader_upload (PublishingFacebookUploader* self, Spit
 	void* _tmp0__target = NULL;
 	SpitPublishingPublishable** _tmp1_ = NULL;
 	gint _tmp1__length1 = 0;
-#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (self));
-#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = status_updated;
-#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0__target = status_updated_target;
-#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->status_updated = _tmp0_;
-#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->status_updated_target = _tmp0__target;
-#line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->publishables;
-#line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1__length1 = self->priv->publishables_length1;
-#line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp1__length1 > 0) {
-#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_uploader_send_files (self);
-#line 11394 "FacebookPublishing.c"
+#line 9358 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_value_uploader_init (GValue* value) {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 11402 "FacebookPublishing.c"
+#line 9366 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_value_uploader_free_value (GValue* value) {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_uploader_unref (value->data[0].v_pointer);
-#line 11411 "FacebookPublishing.c"
+#line 9375 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_value_uploader_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/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 11421 "FacebookPublishing.c"
+#line 9385 "FacebookPublishing.c"
 	} else {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 11425 "FacebookPublishing.c"
+#line 9389 "FacebookPublishing.c"
 	}
 }
 
 
 static gpointer publishing_facebook_value_uploader_peek_pointer (const GValue* value) {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 11433 "FacebookPublishing.c"
+#line 9397 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_value_uploader_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 11440 "FacebookPublishing.c"
+#line 9404 "FacebookPublishing.c"
 		PublishingFacebookUploader* object;
 		object = collect_values[0].v_pointer;
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/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 11447 "FacebookPublishing.c"
+#line 9411 "FacebookPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/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 11451 "FacebookPublishing.c"
+#line 9415 "FacebookPublishing.c"
 		}
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = publishing_facebook_uploader_ref (object);
-#line 11455 "FacebookPublishing.c"
+#line 9419 "FacebookPublishing.c"
 	} else {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 11459 "FacebookPublishing.c"
+#line 9423 "FacebookPublishing.c"
 	}
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 11463 "FacebookPublishing.c"
+#line 9427 "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 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!object_p) {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/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 11474 "FacebookPublishing.c"
+#line 9438 "FacebookPublishing.c"
 	}
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = NULL;
-#line 11480 "FacebookPublishing.c"
+#line 9444 "FacebookPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 11484 "FacebookPublishing.c"
+#line 9448 "FacebookPublishing.c"
 	} else {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = publishing_facebook_uploader_ref (value->data[0].v_pointer);
-#line 11488 "FacebookPublishing.c"
+#line 9452 "FacebookPublishing.c"
 	}
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 11492 "FacebookPublishing.c"
+#line 9456 "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 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/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 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 11506 "FacebookPublishing.c"
+#line 9470 "FacebookPublishing.c"
 }
 
 
 gpointer publishing_facebook_value_get_uploader (const GValue* value) {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/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 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 11515 "FacebookPublishing.c"
+#line 9479 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_value_set_uploader (GValue* value, gpointer v_object) {
 	PublishingFacebookUploader* old;
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_UPLOADER));
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (v_object) {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/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 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/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 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_uploader_ref (value->data[0].v_pointer);
-#line 11535 "FacebookPublishing.c"
+#line 9499 "FacebookPublishing.c"
 	} else {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 11539 "FacebookPublishing.c"
+#line 9503 "FacebookPublishing.c"
 	}
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_uploader_unref (old);
-#line 11545 "FacebookPublishing.c"
+#line 9509 "FacebookPublishing.c"
 	}
 }
 
 
 void publishing_facebook_value_take_uploader (GValue* value, gpointer v_object) {
 	PublishingFacebookUploader* old;
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_UPLOADER));
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (v_object) {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/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 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/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 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 11564 "FacebookPublishing.c"
+#line 9528 "FacebookPublishing.c"
 	} else {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 11568 "FacebookPublishing.c"
+#line 9532 "FacebookPublishing.c"
 	}
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_uploader_unref (old);
-#line 11574 "FacebookPublishing.c"
+#line 9538 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_uploader_class_init (PublishingFacebookUploaderClass * klass) {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_uploader_parent_class = g_type_class_peek_parent (klass);
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookUploaderClass *) klass)->finalize = publishing_facebook_uploader_finalize;
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFacebookUploaderPrivate));
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/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 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/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 11590 "FacebookPublishing.c"
+#line 9554 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_uploader_instance_init (PublishingFacebookUploader * self) {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv = PUBLISHING_FACEBOOK_UPLOADER_GET_PRIVATE (self);
-#line 1567 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->status_updated = NULL;
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->ref_count = 1;
-#line 11601 "FacebookPublishing.c"
+#line 9565 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_uploader_finalize (PublishingFacebookUploader* obj) {
 	PublishingFacebookUploader * self;
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_UPLOADER, PublishingFacebookUploader);
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1305 "/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 1565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_session_unref0 (self->priv->session);
-#line 1566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_publishing_parameters_unref0 (self->priv->publishing_params);
-#line 11617 "FacebookPublishing.c"
+#line 9581 "FacebookPublishing.c"
 }
 
 
@@ -11670,24 +9618,24 @@ GType publishing_facebook_uploader_get_type (void) {
 gpointer publishing_facebook_uploader_ref (gpointer instance) {
 	PublishingFacebookUploader* self;
 	self = instance;
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return instance;
-#line 11642 "FacebookPublishing.c"
+#line 9606 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_uploader_unref (gpointer instance) {
 	PublishingFacebookUploader* self;
 	self = instance;
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		PUBLISHING_FACEBOOK_UPLOADER_GET_CLASS (self)->finalize (self);
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 11655 "FacebookPublishing.c"
+#line 9619 "FacebookPublishing.c"
 	}
 }
 
@@ -11710,16 +9658,4 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify
 }
 
 
-static gint _vala_array_length (gpointer array) {
-	int length;
-	length = 0;
-	if (array) {
-		while (((gpointer*) array)[length]) {
-			length++;
-		}
-	}
-	return length;
-}
-
-
 
diff --git a/plugins/shotwell-publishing/FacebookPublishing.vala b/plugins/shotwell-publishing/FacebookPublishing.vala
index 3fafe37..c979b26 100644
--- a/plugins/shotwell-publishing/FacebookPublishing.vala
+++ b/plugins/shotwell-publishing/FacebookPublishing.vala
@@ -58,13 +58,7 @@ namespace Publishing.Facebook {
 // truly, deep-down know what you're doing)
 public const string SERVICE_NAME = "facebook";
 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.");
-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";
 internal const int EXPIRED_SESSION_STATUS_CODE = 400;
 
 internal class Album {
@@ -174,9 +168,9 @@ internal class PublishingParameters {
 public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object {
     private PublishingParameters publishing_params;
     private weak Spit.Publishing.PluginHost host = null;
-    private WebAuthenticationPane web_auth_pane = null;
     private Spit.Publishing.ProgressCallback progress_reporter = null;
     private weak Spit.Publishing.Service service = null;
+    private Spit.Publishing.Authenticator authenticator = null;
     private bool running = false;
     private GraphSession graph_session;
     private PublishingOptionsPane? publishing_options_pane = null;
@@ -185,42 +179,25 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object {
     private string? username = null;
 
     public FacebookPublisher(Spit.Publishing.Service service,
-        Spit.Publishing.PluginHost host) {
+                             Spit.Publishing.PluginHost host) {
         debug("FacebookPublisher instantiated.");
 
         this.service = service;
         this.host = host;
 
         this.publishing_params = new PublishingParameters();
+        this.authenticator =
+            Publishing.Authenticator.Factory.get_instance().create("facebook",
+                    host);
 
         this.graph_session = new GraphSession();
         graph_session.authenticated.connect(on_session_authenticated);
     }
 
-    private bool is_persistent_session_valid() {
-        string? token = get_persistent_access_token();
-
-        if (token != null)
-            debug("existing Facebook session found in configuration database (access_token = %s).",
-                token);
-        else
-            debug("no existing Facebook session available.");
-
-        return token != null;
-    }
-
-    private string? get_persistent_access_token() {
-        return host.get_config_string("access_token", null);
-    }
-    
     private bool get_persistent_strip_metadata() {
         return host.get_config_bool("strip_metadata", false);
     }
 
-    private void set_persistent_access_token(string access_token) {
-        host.set_config_string("access_token", access_token);
-    }
-    
     private void set_persistent_strip_metadata(bool strip_metadata) {
         host.set_config_bool("strip_metadata", strip_metadata);
     }
@@ -235,19 +212,7 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object {
         host.set_config_int("default_size", size);
     }
 
-    private void invalidate_persistent_session() {
-        debug("invalidating saved Facebook session.");
-
-        set_persistent_access_token("");
-    }
-
-    private void do_show_service_welcome_pane() {
-        debug("ACTION: showing service welcome pane.");
-
-        host.install_welcome_pane(SERVICE_WELCOME_MESSAGE, on_login_clicked);
-        host.set_service_locked(false);
-    }
-
+    /*
     private void do_test_connection_to_endpoint() {
         debug("ACTION: testing connection to Facebook endpoint.");
         host.set_service_locked(true);
@@ -260,6 +225,7 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object {
         
         graph_session.send_message(endpoint_test_message);
     }
+    */
     
     private void do_fetch_user_info() {
         debug("ACTION: fetching user information.");
@@ -376,7 +342,8 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object {
         }
         
         publishing_options_pane = new PublishingOptionsPane(username, publishing_params.albums,
-            host.get_publishable_media_type(), this, builder, get_persistent_strip_metadata());
+            host.get_publishable_media_type(), this, builder, get_persistent_strip_metadata(),
+            authenticator.can_logout());
         publishing_options_pane.logout.connect(on_publishing_options_pane_logout);
         publishing_options_pane.publish.connect(on_publishing_options_pane_publish);
         host.install_dialog_pane(publishing_options_pane,
@@ -385,8 +352,7 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object {
 
     private void do_logout() {
         debug("ACTION: clearing persistent session information and restaring interaction.");
-
-        invalidate_persistent_session();
+        this.authenticator.logout();
 
         running = false;
         start();
@@ -411,60 +377,27 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object {
         do_upload();
     }
 
-    private void do_hosted_web_authentication() {
-        debug("ACTION: doing hosted web authentication.");
-
-        host.set_service_locked(false);
-
-        web_auth_pane = new WebAuthenticationPane();
-        web_auth_pane.login_succeeded.connect(on_web_auth_pane_login_succeeded);
-        web_auth_pane.login_failed.connect(on_web_auth_pane_login_failed);
 
-        host.install_dialog_pane(web_auth_pane,
-            Spit.Publishing.PluginHost.ButtonMode.CANCEL);
+    private void on_authenticator_succeeded() {
+        debug("EVENT: Authenticator login succeeded.");
 
+        do_authenticate_session();
     }
 
-    private void do_authenticate_session(string good_login_uri) {
-        debug("ACTION: preparing to extract session information encoded in uri = '%s'",
-             good_login_uri);
-
-        // the raw uri is percent-encoded, so decode it
-        string decoded_uri = Soup.URI.decode(good_login_uri);
+    private void on_authenticator_failed() {
+    }
 
-        // locate the access token within the URI
-        string? access_token = null;
-        int index = decoded_uri.index_of("#access_token=");
-        if (index >= 0)
-            access_token = decoded_uri[index:decoded_uri.length];
-        if (access_token == null) {
-            host.post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE(
-                "Server redirect URL contained no access token"));
-            return;
+    private void do_authenticate_session() {
+        var parameter = this.authenticator.get_authentication_parameter();
+        Variant access_token;
+        if (!parameter.lookup_extended("AccessToken", null, out access_token)) {
+            critical("Authenticator signalled success, but does not provide access token");
+            assert_not_reached();
         }
-
-        // remove any trailing parameters from the session description string
-        string? trailing_params = null;
-        index = access_token.index_of_char('&');
-        if (index >= 0)
-            trailing_params = access_token[index:access_token.length];
-        if (trailing_params != null)
-            access_token = access_token.replace(trailing_params, "");
-
-        // remove the key from the session description string
-        access_token = access_token.replace("#access_token=", "");
-        
-        // we've got an access token!
         graph_session.authenticated.connect(on_session_authenticated);
-        graph_session.authenticate(access_token);
+        graph_session.authenticate(access_token.get_string());
     }
 
-    private void do_save_session_information() {
-        debug("ACTION: saving session information to configuration system.");
-
-        set_persistent_access_token(graph_session.get_access_token());
-    }
-    
     private void do_upload() {
         debug("ACTION: uploading photos to album '%s'",
             publishing_params.target_album == PublishingParameters.UNKNOWN_ALBUM ? "(none)" :
@@ -505,15 +438,7 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object {
             host.post_error(error);
     }
 
-    private void on_login_clicked() {
-        if (!is_running())
-            return;
-
-        debug("EVENT: user clicked 'Login' on welcome pane.");
-
-        do_test_connection_to_endpoint();
-    }
-
+#if 0
     private void on_endpoint_test_completed(GraphMessage message) {
         message.completed.disconnect(on_endpoint_test_completed);
         message.failed.disconnect(on_endpoint_test_error);
@@ -539,32 +464,7 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object {
 
         on_generic_error(error);
     }
-
-    private void on_web_auth_pane_login_succeeded(string success_url) {
-        if (!is_running())
-            return;
-
-        debug("EVENT: hosted web login succeeded.");
-
-        do_authenticate_session(success_url);
-    }
-
-
-
-    private void on_web_auth_pane_login_failed() {
-        if (!is_running())
-            return;
-
-        debug("EVENT: hosted web login failed.");
-
-        // In this case, "failed" doesn't mean that the user didn't enter the right username and
-        // password -- Facebook handles that case inside the Facebook Connect web control. Instead,
-        // it means that no session was initiated in response to our login request. The only
-        // way this happens is if the user clicks the "Cancel" button that appears inside
-        // the web control. In this case, the correct behavior is to return the user to the
-        // service welcome pane so that they can start the web interaction again.
-        do_show_service_welcome_pane();
-    }
+#endif
 
     private void on_session_authenticated() {
         graph_session.authenticated.disconnect(on_session_authenticated);
@@ -575,7 +475,6 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object {
         assert(graph_session.is_authenticated());
         debug("EVENT: an authenticated session has become available.");
 
-        do_save_session_information();
         do_fetch_user_info();
     }
     
@@ -780,20 +679,9 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object {
         // actually a restart
         publishing_params = new PublishingParameters();
 
-        // Do we have saved user credentials? If so, go ahead and authenticate the session
-        // with the saved credentials and proceed with the publishing interaction. Otherwise, show
-        // the Welcome pane
-        if (is_persistent_session_valid()) {
-            graph_session.authenticate(get_persistent_access_token());
-        } else {
-            if (WebAuthenticationPane.is_cache_dirty()) {
-                host.set_service_locked(false);
-                host.install_static_message_pane(RESTART_ERROR_MESSAGE,
-                    Spit.Publishing.PluginHost.ButtonMode.CANCEL);
-            } else {
-                do_show_service_welcome_pane();
-            }
-        }
+        this.authenticator.authenticated.connect(on_authenticator_succeeded);
+        this.authenticator.authentication_failed.connect(on_authenticator_failed);
+        this.authenticator.authenticate();
     }
 
     public void stop() {
@@ -811,153 +699,6 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object {
     }
 }
 
-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() {
-        Object (login_uri : get_login_url ());
-    }
-
-    private class LocaleLookup {
-        public string prefix;
-        public string translation;
-        public string? exception_code;
-        public string? exception_translation;
-        public string? exception_code_2;
-        public string? exception_translation_2;
-        
-        public LocaleLookup(string prefix, string translation, string? exception_code = null, 
-            string? exception_translation  = null, string? exception_code_2  = null, 
-            string? exception_translation_2 = null) {
-            this.prefix = prefix;
-            this.translation = translation;
-            this.exception_code = exception_code;
-            this.exception_translation = exception_translation;
-            this.exception_code_2 = exception_code_2;
-            this.exception_translation_2 = exception_translation_2;
-        }
-        
-    }
-    
-    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" ),
-        new LocaleLookup( "pt", "pt-br", "PT", "pt-pt" ),
-        new LocaleLookup( "zh", "zh-cn", "HK", "zh-hk", "TW", "zh-tw" ),
-        new LocaleLookup( "af", "af-za" ),
-        new LocaleLookup( "ar", "ar-ar" ),
-        new LocaleLookup( "nb", "nb-no" ),
-        new LocaleLookup( "no", "nb-no" ),
-        new LocaleLookup( "id", "id-id" ),
-        new LocaleLookup( "ms", "ms-my" ),
-        new LocaleLookup( "ca", "ca-es" ),
-        new LocaleLookup( "cs", "cs-cz" ),
-        new LocaleLookup( "cy", "cy-gb" ),
-        new LocaleLookup( "da", "da-dk" ),
-        new LocaleLookup( "de", "de-de" ),
-        new LocaleLookup( "tl", "tl-ph" ),
-        new LocaleLookup( "ko", "ko-kr" ),
-        new LocaleLookup( "hr", "hr-hr" ),
-        new LocaleLookup( "it", "it-it" ),
-        new LocaleLookup( "lt", "lt-lt" ),
-        new LocaleLookup( "hu", "hu-hu" ),
-        new LocaleLookup( "nl", "nl-nl" ),
-        new LocaleLookup( "ja", "ja-jp" ),
-        new LocaleLookup( "nb", "nb-no" ),
-        new LocaleLookup( "no", "nb-no" ),
-        new LocaleLookup( "pl", "pl-pl" ),
-        new LocaleLookup( "ro", "ro-ro" ),
-        new LocaleLookup( "ru", "ru-ru" ),
-        new LocaleLookup( "sk", "sk-sk" ),
-        new LocaleLookup( "sl", "sl-si" ),
-        new LocaleLookup( "sv", "sv-se" ),
-        new LocaleLookup( "th", "th-th" ),
-        new LocaleLookup( "vi", "vi-vn" ),
-        new LocaleLookup( "tr", "tr-tr" ),
-        new LocaleLookup( "el", "el-gr" ),
-        new LocaleLookup( "bg", "bg-bg" ),
-        new LocaleLookup( "sr", "sr-rs" ),
-        new LocaleLookup( "he", "he-il" ),
-        new LocaleLookup( "hi", "hi-in" ),
-        new LocaleLookup( "bn", "bn-in" ),
-        new LocaleLookup( "pa", "pa-in" ),
-        new LocaleLookup( "ta", "ta-in" ),
-        new LocaleLookup( "te", "te-in" ),
-        new LocaleLookup( "ml", "ml-in" )
-    };
-    
-    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";
-        
-        string system_locale = raw_system_locale.split(".")[0];
-        
-        foreach (LocaleLookup locale_lookup in locale_lookup_table) {
-            if (!system_locale.has_prefix(locale_lookup.prefix))
-                continue;
-            
-            if (locale_lookup.exception_code != null) {
-                assert(locale_lookup.exception_translation != null);
-                
-                if (system_locale.contains(locale_lookup.exception_code))
-                    return locale_lookup.exception_translation;
-            }
-            
-            if (locale_lookup.exception_code_2 != null) {
-                assert(locale_lookup.exception_translation_2 != null);
-                
-                if (system_locale.contains(locale_lookup.exception_code_2))
-                    return locale_lookup.exception_translation_2;
-            }
-            
-            return locale_lookup.translation;
-        }
-        
-        // default
-        return "www";
-    }
-
-    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);
-    }
-
-    public override void on_page_load() {
-        string loaded_url = get_view ().uri.dup();
-        debug("loaded url: " + loaded_url);
-
-        // strip parameters from the loaded url
-        if (loaded_url.contains("?")) {
-            int index = loaded_url.index_of_char('?');
-            string params = loaded_url[index:loaded_url.length];
-            loaded_url = loaded_url.replace(params, "");
-        }
-
-        // were we redirected to the facebook login success page?
-        if (loaded_url.contains("login_success")) {
-            cache_dirty = true;
-            login_succeeded(get_view ().uri);
-            return;
-        }
-
-        // were we redirected to the login total failure page?
-        if (loaded_url.contains("login_failure")) {
-            login_failed();
-            return;
-        }
-    }
-
-    public static bool is_cache_dirty() {
-        return cache_dirty;
-    }
-}
-
 internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
     private Gtk.Builder builder;
     private Gtk.Box pane_widget = null;
@@ -1001,7 +742,7 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
 
     public PublishingOptionsPane(string username, Album[] albums,
         Spit.Publishing.Publisher.MediaType media_type, FacebookPublisher publisher,
-        Gtk.Builder builder, bool strip_metadata) {
+        Gtk.Builder builder, bool strip_metadata, bool can_logout) {
 
         this.builder = builder;
         assert(builder != null);
@@ -1025,6 +766,9 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
         visibility_combo = (Gtk.ComboBoxText) this.builder.get_object("visibility_combo");
         publish_button = (Gtk.Button) this.builder.get_object("publish_button");
         logout_button = (Gtk.Button) this.builder.get_object("logout_button");
+        if (!can_logout) {
+            logout_button.parent.remove (logout_button);
+        }
         new_album_entry = (Gtk.Entry) this.builder.get_object("new_album_entry");
         resolution_combo = (Gtk.ComboBoxText) this.builder.get_object("resolution_combo");
         how_to_label = (Gtk.Label) this.builder.get_object("how_to_label");
@@ -1520,14 +1264,11 @@ internal class GraphSession {
         return access_token != null;
     }
     
-    public string get_access_token() {
-        assert(is_authenticated());
-        return access_token;
-    }
-    
+#if 0
     public GraphMessage new_endpoint_test() {
         return new GraphEndpointProbeMessage(this);
     }
+#endif
     
     public GraphMessage new_query(string resource_path) {
         return new GraphQueryMessage(this, resource_path, access_token);
diff --git a/plugins/shotwell-publishing/FlickrPublishing.c b/plugins/shotwell-publishing/FlickrPublishing.c
index f0a92e8..55ad837 100644
--- a/plugins/shotwell-publishing/FlickrPublishing.c
+++ b/plugins/shotwell-publishing/FlickrPublishing.c
@@ -16,12 +16,13 @@
 #include <gio/gio.h>
 #include "shotwell-plugin-common.h"
 #include <glib/gi18n-lib.h>
+#include "shotwell-authenticator.h"
 #include <float.h>
 #include <math.h>
-#include <libsoup/soup.h>
-#include <gtk/gtk.h>
 #include <libxml/tree.h>
+#include <gtk/gtk.h>
 #include <gee.h>
+#include <libsoup/soup.h>
 #include <gexiv2/gexiv2.h>
 #include <gobject/gvaluecollector.h>
 
@@ -98,16 +99,8 @@ typedef struct _PublishingFlickrPublishingOptionsPaneClass PublishingFlickrPubli
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 #define _publishing_rest_support_session_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_session_unref (var), NULL)))
 #define _publishing_flickr_publishing_parameters_unref0(var) ((var == NULL) ? NULL : (var = (publishing_flickr_publishing_parameters_unref (var), NULL)))
-
-#define PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE (publishing_flickr_pin_entry_pane_get_type ())
-#define PUBLISHING_FLICKR_PIN_ENTRY_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingFlickrPinEntryPane))
-#define PUBLISHING_FLICKR_PIN_ENTRY_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingFlickrPinEntryPaneClass))
-#define PUBLISHING_FLICKR_IS_PIN_ENTRY_PANE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE))
-#define PUBLISHING_FLICKR_IS_PIN_ENTRY_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE))
-#define PUBLISHING_FLICKR_PIN_ENTRY_PANE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingFlickrPinEntryPaneClass))
-
-typedef struct _PublishingFlickrPinEntryPane PublishingFlickrPinEntryPane;
-typedef struct _PublishingFlickrPinEntryPaneClass PublishingFlickrPinEntryPaneClass;
+#define _g_variant_unref0(var) ((var == NULL) ? NULL : (var = (g_variant_unref (var), NULL)))
+#define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL)))
 
 #define PUBLISHING_FLICKR_TYPE_TRANSACTION (publishing_flickr_transaction_get_type ())
 #define PUBLISHING_FLICKR_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_FLICKR_TYPE_TRANSACTION, PublishingFlickrTransaction))
@@ -119,29 +112,6 @@ typedef struct _PublishingFlickrPinEntryPaneClass PublishingFlickrPinEntryPaneCl
 typedef struct _PublishingFlickrTransaction PublishingFlickrTransaction;
 typedef struct _PublishingFlickrTransactionClass PublishingFlickrTransactionClass;
 
-#define PUBLISHING_FLICKR_TYPE_AUTHENTICATION_REQUEST_TRANSACTION (publishing_flickr_authentication_request_transaction_get_type ())
-#define PUBLISHING_FLICKR_AUTHENTICATION_REQUEST_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_FLICKR_TYPE_AUTHENTICATION_REQUEST_TRANSACTION, PublishingFlickrAuthenticationRequestTransaction))
-#define PUBLISHING_FLICKR_AUTHENTICATION_REQUEST_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_FLICKR_TYPE_AUTHENTICATION_REQUEST_TRANSACTION, PublishingFlickrAuthenticationRequestTransactionClass))
-#define PUBLISHING_FLICKR_IS_AUTHENTICATION_REQUEST_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_FLICKR_TYPE_AUTHENTICATION_REQUEST_TRANSACTION))
-#define PUBLISHING_FLICKR_IS_AUTHENTICATION_REQUEST_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_FLICKR_TYPE_AUTHENTICATION_REQUEST_TRANSACTION))
-#define PUBLISHING_FLICKR_AUTHENTICATION_REQUEST_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_FLICKR_TYPE_AUTHENTICATION_REQUEST_TRANSACTION, PublishingFlickrAuthenticationRequestTransactionClass))
-
-typedef struct _PublishingFlickrAuthenticationRequestTransaction PublishingFlickrAuthenticationRequestTransaction;
-typedef struct _PublishingFlickrAuthenticationRequestTransactionClass PublishingFlickrAuthenticationRequestTransactionClass;
-#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 _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL)))
-
-#define PUBLISHING_FLICKR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION (publishing_flickr_access_token_fetch_transaction_get_type ())
-#define PUBLISHING_FLICKR_ACCESS_TOKEN_FETCH_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_FLICKR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, PublishingFlickrAccessTokenFetchTransaction))
-#define PUBLISHING_FLICKR_ACCESS_TOKEN_FETCH_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_FLICKR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, PublishingFlickrAccessTokenFetchTransactionClass))
-#define PUBLISHING_FLICKR_IS_ACCESS_TOKEN_FETCH_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_FLICKR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION))
-#define PUBLISHING_FLICKR_IS_ACCESS_TOKEN_FETCH_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_FLICKR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION))
-#define PUBLISHING_FLICKR_ACCESS_TOKEN_FETCH_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_FLICKR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, PublishingFlickrAccessTokenFetchTransactionClass))
-
-typedef struct _PublishingFlickrAccessTokenFetchTransaction PublishingFlickrAccessTokenFetchTransaction;
-typedef struct _PublishingFlickrAccessTokenFetchTransactionClass PublishingFlickrAccessTokenFetchTransactionClass;
-
 #define PUBLISHING_FLICKR_TYPE_ACCOUNT_INFO_FETCH_TRANSACTION (publishing_flickr_account_info_fetch_transaction_get_type ())
 #define PUBLISHING_FLICKR_ACCOUNT_INFO_FETCH_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_FLICKR_TYPE_ACCOUNT_INFO_FETCH_TRANSACTION, PublishingFlickrAccountInfoFetchTransaction))
 #define PUBLISHING_FLICKR_ACCOUNT_INFO_FETCH_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_FLICKR_TYPE_ACCOUNT_INFO_FETCH_TRANSACTION, PublishingFlickrAccountInfoFetchTransactionClass))
@@ -151,6 +121,8 @@ typedef struct _PublishingFlickrAccessTokenFetchTransactionClass PublishingFlick
 
 typedef struct _PublishingFlickrAccountInfoFetchTransaction PublishingFlickrAccountInfoFetchTransaction;
 typedef struct _PublishingFlickrAccountInfoFetchTransactionClass PublishingFlickrAccountInfoFetchTransactionClass;
+#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)))
 #define _g_date_time_unref0(var) ((var == NULL) ? NULL : (var = (g_date_time_unref (var), NULL)))
 
@@ -164,11 +136,7 @@ typedef struct _PublishingFlickrAccountInfoFetchTransactionClass PublishingFlick
 typedef struct _PublishingFlickrUploader PublishingFlickrUploader;
 typedef struct _PublishingFlickrUploaderClass PublishingFlickrUploaderClass;
 #define _publishing_rest_support_batch_uploader_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_batch_uploader_unref (var), NULL)))
-typedef struct _PublishingFlickrPinEntryPanePrivate PublishingFlickrPinEntryPanePrivate;
-#define _g_slist_free0(var) ((var == NULL) ? NULL : (var = (g_slist_free (var), NULL)))
 typedef struct _PublishingFlickrTransactionPrivate PublishingFlickrTransactionPrivate;
-typedef struct _PublishingFlickrAuthenticationRequestTransactionPrivate PublishingFlickrAuthenticationRequestTransactionPrivate;
-typedef struct _PublishingFlickrAccessTokenFetchTransactionPrivate PublishingFlickrAccessTokenFetchTransactionPrivate;
 typedef struct _PublishingFlickrAccountInfoFetchTransactionPrivate PublishingFlickrAccountInfoFetchTransactionPrivate;
 
 #define PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION (publishing_flickr_upload_transaction_get_type ())
@@ -204,6 +172,7 @@ typedef struct _PublishingFlickrPublishingOptionsPaneVisibilityEntryClass Publis
 
 typedef struct _PublishingFlickrPublishingOptionsPaneSizeEntry PublishingFlickrPublishingOptionsPaneSizeEntry;
 typedef struct _PublishingFlickrPublishingOptionsPaneSizeEntryClass PublishingFlickrPublishingOptionsPaneSizeEntryClass;
+#define _g_slist_free0(var) ((var == NULL) ? NULL : (var = (g_slist_free (var), NULL)))
 typedef struct _PublishingFlickrPublishingOptionsPaneVisibilityEntryPrivate PublishingFlickrPublishingOptionsPaneVisibilityEntryPrivate;
 typedef struct _PublishingFlickrPublishingOptionsPaneSizeEntryPrivate PublishingFlickrPublishingOptionsPaneSizeEntryPrivate;
 #define _publishing_flickr_publishing_options_pane_visibility_entry_unref0(var) ((var == NULL) ? NULL : (var = (publishing_flickr_publishing_options_pane_visibility_entry_unref (var), NULL)))
@@ -287,27 +256,10 @@ struct _PublishingFlickrFlickrPublisherPrivate {
 	gboolean was_started;
 	PublishingFlickrSession* session;
 	PublishingFlickrPublishingOptionsPane* publishing_options_pane;
+	SpitPublishingAuthenticator* authenticator;
 	PublishingFlickrPublishingParameters* parameters;
 };
 
-struct _PublishingFlickrPinEntryPane {
-	GObject parent_instance;
-	PublishingFlickrPinEntryPanePrivate * priv;
-};
-
-struct _PublishingFlickrPinEntryPaneClass {
-	GObjectClass parent_class;
-};
-
-struct _PublishingFlickrPinEntryPanePrivate {
-	GtkBox* pane_widget;
-	GtkButton* continue_button;
-	GtkEntry* pin_entry;
-	GtkLabel* pin_entry_caption;
-	GtkLabel* explanatory_text;
-	GtkBuilder* builder;
-};
-
 struct _PublishingFlickrTransaction {
 	PublishingRESTSupportTransaction parent_instance;
 	PublishingFlickrTransactionPrivate * priv;
@@ -317,24 +269,6 @@ struct _PublishingFlickrTransactionClass {
 	PublishingRESTSupportTransactionClass parent_class;
 };
 
-struct _PublishingFlickrAuthenticationRequestTransaction {
-	PublishingFlickrTransaction parent_instance;
-	PublishingFlickrAuthenticationRequestTransactionPrivate * priv;
-};
-
-struct _PublishingFlickrAuthenticationRequestTransactionClass {
-	PublishingFlickrTransactionClass parent_class;
-};
-
-struct _PublishingFlickrAccessTokenFetchTransaction {
-	PublishingFlickrTransaction parent_instance;
-	PublishingFlickrAccessTokenFetchTransactionPrivate * priv;
-};
-
-struct _PublishingFlickrAccessTokenFetchTransactionClass {
-	PublishingFlickrTransactionClass parent_class;
-};
-
 struct _PublishingFlickrAccountInfoFetchTransaction {
 	PublishingFlickrTransaction parent_instance;
 	PublishingFlickrAccountInfoFetchTransactionPrivate * priv;
@@ -371,11 +305,11 @@ struct _PublishingFlickrSessionClass {
 };
 
 struct _PublishingFlickrSessionPrivate {
-	gchar* request_phase_token;
-	gchar* request_phase_token_secret;
 	gchar* access_phase_token;
 	gchar* access_phase_token_secret;
 	gchar* username;
+	gchar* consumer_key;
+	gchar* consumer_secret;
 };
 
 struct _PublishingFlickrPublishingOptionsPane {
@@ -470,11 +404,7 @@ static gpointer publishing_flickr_visibility_specification_parent_class = NULL;
 static gpointer publishing_flickr_publishing_parameters_parent_class = NULL;
 static gpointer publishing_flickr_flickr_publisher_parent_class = NULL;
 static SpitPublishingPublisherIface* publishing_flickr_flickr_publisher_spit_publishing_publisher_parent_iface = NULL;
-static gpointer publishing_flickr_pin_entry_pane_parent_class = NULL;
-static SpitPublishingDialogPaneIface* publishing_flickr_pin_entry_pane_spit_publishing_dialog_pane_parent_iface = NULL;
 static gpointer publishing_flickr_transaction_parent_class = NULL;
-static gpointer publishing_flickr_authentication_request_transaction_parent_class = NULL;
-static gpointer publishing_flickr_access_token_fetch_transaction_parent_class = NULL;
 static gpointer publishing_flickr_account_info_fetch_transaction_parent_class = NULL;
 static gpointer publishing_flickr_upload_transaction_parent_class = NULL;
 static gpointer publishing_flickr_session_parent_class = NULL;
@@ -504,17 +434,7 @@ GType publishing_flickr_flickr_publisher_get_type (void) G_GNUC_CONST;
 static SpitPublishingPublisherMediaType flickr_service_real_get_supported_media (SpitPublishingService* base);
 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 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" \
-"To continue publishing to Flickr, quit and restart Shotwell, then try " \
-"publishing again.")
 #define PUBLISHING_FLICKR_ENDPOINT_URL "https://api.flickr.com/services/rest"
-#define PUBLISHING_FLICKR_API_KEY "60dd96d4a2ad04888b09c9e18d82c26f"
-#define PUBLISHING_FLICKR_API_SECRET "d0960565e03547c1"
 #define PUBLISHING_FLICKR_ORIGINAL_SIZE -1
 #define PUBLISHING_FLICKR_EXPIRED_SESSION_ERROR_CODE "98"
 #define PUBLISHING_FLICKR_ENCODE_RFC_3986_EXTRA "!*'();:@&=+$,/?%#[] \\"
@@ -552,43 +472,15 @@ enum  {
 	PUBLISHING_FLICKR_FLICKR_PUBLISHER_DUMMY_PROPERTY
 };
 static void publishing_flickr_flickr_publisher_on_session_authenticated (PublishingFlickrFlickrPublisher* self);
-static void _publishing_flickr_flickr_publisher_on_session_authenticated_publishing_rest_support_session_authenticated (PublishingRESTSupportSession* _sender, gpointer self);
+static void _publishing_flickr_flickr_publisher_on_session_authenticated_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender, gpointer self);
 PublishingFlickrSession* publishing_flickr_session_new (void);
 PublishingFlickrSession* publishing_flickr_session_construct (GType object_type);
-static void publishing_flickr_flickr_publisher_invalidate_persistent_session (PublishingFlickrFlickrPublisher* self);
-static void publishing_flickr_flickr_publisher_set_persistent_access_phase_token (PublishingFlickrFlickrPublisher* self, const gchar* token);
-static void publishing_flickr_flickr_publisher_set_persistent_access_phase_token_secret (PublishingFlickrFlickrPublisher* self, const gchar* secret);
-static void publishing_flickr_flickr_publisher_set_persistent_access_phase_username (PublishingFlickrFlickrPublisher* self, const gchar* username);
-static gboolean publishing_flickr_flickr_publisher_is_persistent_session_valid (PublishingFlickrFlickrPublisher* self);
-static gchar* publishing_flickr_flickr_publisher_get_persistent_access_phase_username (PublishingFlickrFlickrPublisher* self);
-static gchar* publishing_flickr_flickr_publisher_get_persistent_access_phase_token (PublishingFlickrFlickrPublisher* self);
-static gchar* publishing_flickr_flickr_publisher_get_persistent_access_phase_token_secret (PublishingFlickrFlickrPublisher* self);
+SpitPublishingAuthenticator* publishing_flickr_flickr_publisher_get_authenticator (PublishingFlickrFlickrPublisher* self);
 static gboolean publishing_flickr_flickr_publisher_get_persistent_strip_metadata (PublishingFlickrFlickrPublisher* self);
 static void publishing_flickr_flickr_publisher_set_persistent_strip_metadata (PublishingFlickrFlickrPublisher* self, gboolean strip_metadata);
-static void publishing_flickr_flickr_publisher_on_welcome_pane_login_clicked (PublishingFlickrFlickrPublisher* self);
-static void publishing_flickr_flickr_publisher_do_run_authentication_request_transaction (PublishingFlickrFlickrPublisher* self);
-static void publishing_flickr_flickr_publisher_on_auth_request_txn_completed (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_flickr_flickr_publisher_on_auth_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_flickr_flickr_publisher_on_auth_request_txn_error (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportTransaction* txn, GError* err);
-static void _publishing_flickr_flickr_publisher_on_auth_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_flickr_flickr_publisher_do_parse_token_info_from_auth_request (PublishingFlickrFlickrPublisher* self, const gchar* response);
-static void publishing_flickr_flickr_publisher_on_authentication_token_available (PublishingFlickrFlickrPublisher* self, const gchar* token, const gchar* token_secret);
-void publishing_flickr_session_set_request_phase_credentials (PublishingFlickrSession* self, const gchar* token, const gchar* secret);
-static void publishing_flickr_flickr_publisher_do_launch_system_browser (PublishingFlickrFlickrPublisher* self, const gchar* token);
-static void publishing_flickr_flickr_publisher_on_system_browser_launched (PublishingFlickrFlickrPublisher* self);
-static void publishing_flickr_flickr_publisher_do_show_pin_entry_pane (PublishingFlickrFlickrPublisher* self);
-GType publishing_flickr_pin_entry_pane_get_type (void) G_GNUC_CONST;
-static void publishing_flickr_flickr_publisher_on_pin_entry_proceed (PublishingFlickrFlickrPublisher* self, PublishingFlickrPinEntryPane* sender, const gchar* pin);
-static void _publishing_flickr_flickr_publisher_on_pin_entry_proceed_publishing_flickr_pin_entry_pane_proceed (PublishingFlickrPinEntryPane* _sender, PublishingFlickrPinEntryPane* sender, const gchar* authorization_pin, gpointer self);
-static void publishing_flickr_flickr_publisher_do_verify_pin (PublishingFlickrFlickrPublisher* self, const gchar* pin);
-static void publishing_flickr_flickr_publisher_on_access_token_fetch_txn_completed (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_flickr_flickr_publisher_on_access_token_fetch_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_flickr_flickr_publisher_on_access_token_fetch_error (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportTransaction* txn, GError* err);
-static void _publishing_flickr_flickr_publisher_on_access_token_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_flickr_flickr_publisher_do_extract_access_phase_credentials_from_reponse (PublishingFlickrFlickrPublisher* self, const gchar* response);
+void publishing_flickr_session_set_api_credentials (PublishingFlickrSession* self, const gchar* consumer_key, const gchar* consumer_secret);
+void publishing_flickr_session_set_access_phase_credentials (PublishingFlickrSession* self, const gchar* token, const gchar* secret, const gchar* username);
 gchar* publishing_flickr_session_get_username (PublishingFlickrSession* self);
-gchar* publishing_flickr_session_get_access_phase_token (PublishingFlickrSession* self);
-gchar* publishing_flickr_session_get_access_phase_token_secret (PublishingFlickrSession* self);
 static void publishing_flickr_flickr_publisher_do_fetch_account_info (PublishingFlickrFlickrPublisher* self);
 static void publishing_flickr_flickr_publisher_on_account_fetch_txn_completed (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportTransaction* txn);
 static void _publishing_flickr_flickr_publisher_on_account_fetch_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
@@ -609,23 +501,11 @@ static void _publishing_flickr_flickr_publisher_on_upload_complete_publishing_re
 static void publishing_flickr_flickr_publisher_on_upload_error (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err);
 static void _publishing_flickr_flickr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self);
 static void publishing_flickr_flickr_publisher_do_show_success_pane (PublishingFlickrFlickrPublisher* self);
-static void publishing_flickr_flickr_publisher_do_show_login_welcome_pane (PublishingFlickrFlickrPublisher* self);
-static void _publishing_flickr_flickr_publisher_on_welcome_pane_login_clicked_spit_publishing_login_callback (gpointer self);
 GType publishing_flickr_transaction_get_type (void) G_GNUC_CONST;
-GType publishing_flickr_authentication_request_transaction_get_type (void) G_GNUC_CONST;
-PublishingFlickrAuthenticationRequestTransaction* publishing_flickr_authentication_request_transaction_new (PublishingFlickrSession* session);
-PublishingFlickrAuthenticationRequestTransaction* publishing_flickr_authentication_request_transaction_construct (GType object_type, PublishingFlickrSession* session);
-PublishingFlickrPinEntryPane* publishing_flickr_pin_entry_pane_new (GtkBuilder* builder);
-PublishingFlickrPinEntryPane* publishing_flickr_pin_entry_pane_construct (GType object_type, GtkBuilder* builder);
-GType publishing_flickr_access_token_fetch_transaction_get_type (void) G_GNUC_CONST;
-PublishingFlickrAccessTokenFetchTransaction* publishing_flickr_access_token_fetch_transaction_new (PublishingFlickrSession* session, const gchar* user_verifier);
-PublishingFlickrAccessTokenFetchTransaction* publishing_flickr_access_token_fetch_transaction_construct (GType object_type, PublishingFlickrSession* session, const gchar* user_verifier);
-void publishing_flickr_session_set_access_phase_credentials (PublishingFlickrSession* self, const gchar* token, const gchar* secret, const gchar* username);
 GType publishing_flickr_account_info_fetch_transaction_get_type (void) G_GNUC_CONST;
 PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetch_transaction_new (PublishingFlickrSession* session);
 PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetch_transaction_construct (GType object_type, PublishingFlickrSession* session);
 PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_response (const gchar* xml, GError** error);
-void publishing_flickr_session_deauthenticate (PublishingFlickrSession* self);
 static void publishing_flickr_flickr_publisher_attempt_start (PublishingFlickrFlickrPublisher* self);
 PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane_new (PublishingFlickrFlickrPublisher* publisher, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublisherMediaType media_type, GtkBuilder* builder, gboolean strip_metadata);
 PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane_construct (GType object_type, PublishingFlickrFlickrPublisher* publisher, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublisherMediaType media_type, GtkBuilder* builder, gboolean strip_metadata);
@@ -641,24 +521,9 @@ gint publishing_flickr_flickr_publisher_get_persistent_default_size (PublishingF
 void publishing_flickr_flickr_publisher_set_persistent_default_size (PublishingFlickrFlickrPublisher* self, gint size);
 static SpitPublishingService* publishing_flickr_flickr_publisher_real_get_service (SpitPublishingPublisher* base);
 static gboolean publishing_flickr_flickr_publisher_real_is_running (SpitPublishingPublisher* base);
-void publishing_flickr_session_authenticate_from_persistent_credentials (PublishingFlickrSession* self, const gchar* token, const gchar* secret, const gchar* username);
 static void publishing_flickr_flickr_publisher_real_start (SpitPublishingPublisher* base);
 static void publishing_flickr_flickr_publisher_real_stop (SpitPublishingPublisher* base);
 static void publishing_flickr_flickr_publisher_finalize (GObject* obj);
-#define PUBLISHING_FLICKR_PIN_ENTRY_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingFlickrPinEntryPanePrivate))
-enum  {
-	PUBLISHING_FLICKR_PIN_ENTRY_PANE_DUMMY_PROPERTY
-};
-static void publishing_flickr_pin_entry_pane_on_pin_entry_contents_changed (PublishingFlickrPinEntryPane* self);
-static void publishing_flickr_pin_entry_pane_on_continue_clicked (PublishingFlickrPinEntryPane* self);
-static GtkWidget* publishing_flickr_pin_entry_pane_real_get_widget (SpitPublishingDialogPane* base);
-static SpitPublishingDialogPaneGeometryOptions publishing_flickr_pin_entry_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
-static void publishing_flickr_pin_entry_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
-static void _publishing_flickr_pin_entry_pane_on_continue_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void _publishing_flickr_pin_entry_pane_on_pin_entry_contents_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
-static void publishing_flickr_pin_entry_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
-static void g_cclosure_user_marshal_VOID__OBJECT_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-static void publishing_flickr_pin_entry_pane_finalize (GObject* obj);
 enum  {
 	PUBLISHING_FLICKR_TRANSACTION_DUMMY_PROPERTY
 };
@@ -666,6 +531,7 @@ PublishingFlickrTransaction* publishing_flickr_transaction_new (PublishingFlickr
 PublishingFlickrTransaction* publishing_flickr_transaction_construct (GType object_type, PublishingFlickrSession* session, PublishingRESTSupportHttpMethod method);
 gchar* publishing_flickr_session_get_oauth_nonce (PublishingFlickrSession* self);
 gchar* publishing_flickr_session_get_oauth_timestamp (PublishingFlickrSession* self);
+gchar* publishing_flickr_session_get_consumer_key (PublishingFlickrSession* self);
 PublishingFlickrTransaction* publishing_flickr_transaction_new_with_uri (PublishingFlickrSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method);
 PublishingFlickrTransaction* publishing_flickr_transaction_construct_with_uri (GType object_type, PublishingFlickrSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method);
 static void publishing_flickr_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error);
@@ -673,15 +539,9 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self,
 gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc);
 static gchar* _publishing_flickr_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self);
 enum  {
-	PUBLISHING_FLICKR_AUTHENTICATION_REQUEST_TRANSACTION_DUMMY_PROPERTY
-};
-enum  {
-	PUBLISHING_FLICKR_ACCESS_TOKEN_FETCH_TRANSACTION_DUMMY_PROPERTY
-};
-gchar* publishing_flickr_session_get_request_phase_token (PublishingFlickrSession* self);
-enum  {
 	PUBLISHING_FLICKR_ACCOUNT_INFO_FETCH_TRANSACTION_DUMMY_PROPERTY
 };
+gchar* publishing_flickr_session_get_access_phase_token (PublishingFlickrSession* self);
 GType publishing_flickr_upload_transaction_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_FLICKR_UPLOAD_TRANSACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION, PublishingFlickrUploadTransactionPrivate))
 enum  {
@@ -691,7 +551,7 @@ PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_new (Pub
 PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_construct (GType object_type, PublishingFlickrSession* session, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublishable* publishable);
 void publishing_flickr_upload_transaction_add_authorization_header_field (PublishingFlickrUploadTransaction* self, const gchar* key, const gchar* value);
 static void _g_free0_ (gpointer var);
-static void _vala_array_add18 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value);
+static void _vala_array_add19 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value);
 PublishingRESTSupportArgument** publishing_flickr_upload_transaction_get_authorization_header_fields (PublishingFlickrUploadTransaction* self, int* result_length1);
 static PublishingRESTSupportArgument** _vala_array_dup8 (PublishingRESTSupportArgument** self, int length);
 gchar* publishing_flickr_upload_transaction_get_authorization_header_string (PublishingFlickrUploadTransaction* self);
@@ -702,7 +562,7 @@ enum  {
 	PUBLISHING_FLICKR_SESSION_DUMMY_PROPERTY
 };
 static gboolean publishing_flickr_session_real_is_authenticated (PublishingRESTSupportSession* base);
-static void _vala_array_add19 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value);
+static void _vala_array_add20 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value);
 static void publishing_flickr_session_finalize (PublishingRESTSupportSession* obj);
 static gpointer publishing_flickr_publishing_options_pane_visibility_entry_ref (gpointer instance);
 static void publishing_flickr_publishing_options_pane_visibility_entry_unref (gpointer instance);
@@ -736,18 +596,18 @@ static void publishing_flickr_publishing_options_pane_on_publish_clicked (Publis
 static void _publishing_flickr_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
 static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_publishing_options_pane_visibility_entry_new (const gchar* creator_title, PublishingFlickrVisibilitySpecification* creator_specification);
 static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_publishing_options_pane_visibility_entry_construct (GType object_type, const gchar* creator_title, PublishingFlickrVisibilitySpecification* creator_specification);
-static void _vala_array_add20 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value);
 static void _vala_array_add21 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value);
 static void _vala_array_add22 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value);
 static void _vala_array_add23 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value);
 static void _vala_array_add24 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value);
+static void _vala_array_add25 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value);
 static PublishingFlickrPublishingOptionsPaneSizeEntry* publishing_flickr_publishing_options_pane_size_entry_new (const gchar* creator_title, gint creator_size);
 static PublishingFlickrPublishingOptionsPaneSizeEntry* publishing_flickr_publishing_options_pane_size_entry_construct (GType object_type, const gchar* creator_title, gint creator_size);
-static void _vala_array_add25 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value);
 static void _vala_array_add26 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value);
 static void _vala_array_add27 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value);
 static void _vala_array_add28 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value);
 static void _vala_array_add29 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value);
+static void _vala_array_add30 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value);
 void publishing_flickr_publishing_options_pane_notify_publish (PublishingFlickrPublishingOptionsPane* self);
 void publishing_flickr_publishing_options_pane_notify_logout (PublishingFlickrPublishingOptionsPane* self);
 static GtkWidget* publishing_flickr_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base);
@@ -770,7 +630,7 @@ enum  {
 	PUBLISHING_FLICKR_UPLOADER_DUMMY_PROPERTY
 };
 static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrUploader* self, SpitPublishingPublishable* publishable);
-static void _vala_array_add30 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add31 (gchar*** array, int* length, int* size, gchar* value);
 static PublishingRESTSupportTransaction* publishing_flickr_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable);
 static void publishing_flickr_uploader_finalize (PublishingRESTSupportBatchUploader* obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
@@ -792,7 +652,7 @@ FlickrService* flickr_service_construct (GType object_type, GFile* resource_dire
 	_tmp0__length1 = flickr_service_icon_pixbuf_set_length1;
 #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 790 "FlickrPublishing.c"
+#line 656 "FlickrPublishing.c"
 		gint _tmp1_ = 0;
 		GdkPixbuf** _tmp2_ = NULL;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -805,18 +665,18 @@ FlickrService* flickr_service_construct (GType object_type, GFile* resource_dire
 		flickr_service_icon_pixbuf_set_length1 = _tmp1_;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_flickr_service_icon_pixbuf_set_size_ = flickr_service_icon_pixbuf_set_length1;
-#line 803 "FlickrPublishing.c"
+#line 669 "FlickrPublishing.c"
 	}
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 807 "FlickrPublishing.c"
+#line 673 "FlickrPublishing.c"
 }
 
 
 FlickrService* flickr_service_new (GFile* resource_directory) {
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return flickr_service_construct (TYPE_FLICKR_SERVICE, resource_directory);
-#line 814 "FlickrPublishing.c"
+#line 680 "FlickrPublishing.c"
 }
 
 
@@ -838,7 +698,7 @@ static gint flickr_service_real_get_pluggable_interface (SpitPluggable* base, gi
 	result = _tmp2_;
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 836 "FlickrPublishing.c"
+#line 702 "FlickrPublishing.c"
 }
 
 
@@ -851,7 +711,7 @@ static const gchar* flickr_service_real_get_id (SpitPluggable* base) {
 	result = "org.yorba.shotwell.publishing.flickr";
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 849 "FlickrPublishing.c"
+#line 715 "FlickrPublishing.c"
 }
 
 
@@ -864,14 +724,14 @@ static const gchar* flickr_service_real_get_pluggable_name (SpitPluggable* base)
 	result = "Flickr";
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 862 "FlickrPublishing.c"
+#line 728 "FlickrPublishing.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 869 "FlickrPublishing.c"
+#line 735 "FlickrPublishing.c"
 }
 
 
@@ -882,17 +742,17 @@ static GdkPixbuf** _vala_array_dup7 (GdkPixbuf** self, int length) {
 	result = g_new0 (GdkPixbuf*, length + 1);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 880 "FlickrPublishing.c"
+#line 746 "FlickrPublishing.c"
 		GdkPixbuf* _tmp0_ = NULL;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		result[i] = _tmp0_;
-#line 886 "FlickrPublishing.c"
+#line 752 "FlickrPublishing.c"
 	}
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 890 "FlickrPublishing.c"
+#line 756 "FlickrPublishing.c"
 }
 
 
@@ -974,7 +834,7 @@ static void flickr_service_real_get_info (SpitPluggable* base, SpitPluggableInfo
 	(*info).icons = _tmp9_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*info).icons_length1 = _tmp9__length1;
-#line 972 "FlickrPublishing.c"
+#line 838 "FlickrPublishing.c"
 }
 
 
@@ -982,7 +842,7 @@ static void flickr_service_real_activation (SpitPluggable* base, gboolean enable
 	FlickrService * self;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FLICKR_SERVICE, FlickrService);
-#line 980 "FlickrPublishing.c"
+#line 846 "FlickrPublishing.c"
 }
 
 
@@ -1003,7 +863,7 @@ static SpitPublishingPublisher* flickr_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/FlickrPublishing.vala"
 	return result;
-#line 1001 "FlickrPublishing.c"
+#line 867 "FlickrPublishing.c"
 }
 
 
@@ -1016,7 +876,7 @@ static SpitPublishingPublisherMediaType flickr_service_real_get_supported_media
 	result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO;
 #line 51 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 1014 "FlickrPublishing.c"
+#line 880 "FlickrPublishing.c"
 }
 
 
@@ -1025,7 +885,7 @@ static void flickr_service_class_init (FlickrServiceClass * klass) {
 	flickr_service_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = flickr_service_finalize;
-#line 1023 "FlickrPublishing.c"
+#line 889 "FlickrPublishing.c"
 }
 
 
@@ -1042,7 +902,7 @@ static void flickr_service_spit_pluggable_interface_init (SpitPluggableIface * i
 	iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) flickr_service_real_get_info;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	iface->activation = (void (*)(SpitPluggable*, gboolean)) flickr_service_real_activation;
-#line 1040 "FlickrPublishing.c"
+#line 906 "FlickrPublishing.c"
 }
 
 
@@ -1053,7 +913,7 @@ static void flickr_service_spit_publishing_service_interface_init (SpitPublishin
 	iface->create_publisher = (SpitPublishingPublisher* (*)(SpitPublishingService*, SpitPublishingPluginHost*)) flickr_service_real_create_publisher;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	iface->get_supported_media = (SpitPublishingPublisherMediaType (*)(SpitPublishingService*)) flickr_service_real_get_supported_media;
-#line 1051 "FlickrPublishing.c"
+#line 917 "FlickrPublishing.c"
 }
 
 
@@ -1067,7 +927,7 @@ static void flickr_service_finalize (GObject* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FLICKR_SERVICE, FlickrService);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_OBJECT_CLASS (flickr_service_parent_class)->finalize (obj);
-#line 1065 "FlickrPublishing.c"
+#line 931 "FlickrPublishing.c"
 }
 
 
@@ -1104,236 +964,236 @@ PublishingFlickrVisibilitySpecification* publishing_flickr_visibility_specificat
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrVisibilitySpecification*) g_type_create_instance (object_type);
-#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = friends_level;
-#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->friends_level = _tmp0_;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = family_level;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->family_level = _tmp1_;
-#line 83 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = everyone_level;
-#line 83 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->everyone_level = _tmp2_;
-#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 1118 "FlickrPublishing.c"
+#line 984 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrVisibilitySpecification* publishing_flickr_visibility_specification_new (gint friends_level, gint family_level, gint everyone_level) {
-#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_visibility_specification_construct (PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION, friends_level, family_level, everyone_level);
-#line 1125 "FlickrPublishing.c"
+#line 991 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_value_visibility_specification_init (GValue* value) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 1132 "FlickrPublishing.c"
+#line 998 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_value_visibility_specification_free_value (GValue* value) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_visibility_specification_unref (value->data[0].v_pointer);
-#line 1141 "FlickrPublishing.c"
+#line 1007 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_value_visibility_specification_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_flickr_visibility_specification_ref (src_value->data[0].v_pointer);
-#line 1151 "FlickrPublishing.c"
+#line 1017 "FlickrPublishing.c"
 	} else {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1155 "FlickrPublishing.c"
+#line 1021 "FlickrPublishing.c"
 	}
 }
 
 
 static gpointer publishing_flickr_value_visibility_specification_peek_pointer (const GValue* value) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1163 "FlickrPublishing.c"
+#line 1029 "FlickrPublishing.c"
 }
 
 
 static gchar* publishing_flickr_value_visibility_specification_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 1170 "FlickrPublishing.c"
+#line 1036 "FlickrPublishing.c"
 		PublishingFlickrVisibilitySpecification* object;
 		object = collect_values[0].v_pointer;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1177 "FlickrPublishing.c"
+#line 1043 "FlickrPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 1181 "FlickrPublishing.c"
+#line 1047 "FlickrPublishing.c"
 		}
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = publishing_flickr_visibility_specification_ref (object);
-#line 1185 "FlickrPublishing.c"
+#line 1051 "FlickrPublishing.c"
 	} else {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1189 "FlickrPublishing.c"
+#line 1055 "FlickrPublishing.c"
 	}
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 1193 "FlickrPublishing.c"
+#line 1059 "FlickrPublishing.c"
 }
 
 
 static gchar* publishing_flickr_value_visibility_specification_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingFlickrVisibilitySpecification** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!object_p) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1204 "FlickrPublishing.c"
+#line 1070 "FlickrPublishing.c"
 	}
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = NULL;
-#line 1210 "FlickrPublishing.c"
+#line 1076 "FlickrPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1214 "FlickrPublishing.c"
+#line 1080 "FlickrPublishing.c"
 	} else {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = publishing_flickr_visibility_specification_ref (value->data[0].v_pointer);
-#line 1218 "FlickrPublishing.c"
+#line 1084 "FlickrPublishing.c"
 	}
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 1222 "FlickrPublishing.c"
+#line 1088 "FlickrPublishing.c"
 }
 
 
 GParamSpec* publishing_flickr_param_spec_visibility_specification (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingFlickrParamSpecVisibilitySpecification* spec;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION), NULL);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 1236 "FlickrPublishing.c"
+#line 1102 "FlickrPublishing.c"
 }
 
 
 gpointer publishing_flickr_value_get_visibility_specification (const GValue* value) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION), NULL);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1245 "FlickrPublishing.c"
+#line 1111 "FlickrPublishing.c"
 }
 
 
 void publishing_flickr_value_set_visibility_specification (GValue* value, gpointer v_object) {
 	PublishingFlickrVisibilitySpecification* old;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION));
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (v_object) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION));
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_visibility_specification_ref (value->data[0].v_pointer);
-#line 1265 "FlickrPublishing.c"
+#line 1131 "FlickrPublishing.c"
 	} else {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1269 "FlickrPublishing.c"
+#line 1135 "FlickrPublishing.c"
 	}
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_visibility_specification_unref (old);
-#line 1275 "FlickrPublishing.c"
+#line 1141 "FlickrPublishing.c"
 	}
 }
 
 
 void publishing_flickr_value_take_visibility_specification (GValue* value, gpointer v_object) {
 	PublishingFlickrVisibilitySpecification* old;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION));
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (v_object) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION));
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1294 "FlickrPublishing.c"
+#line 1160 "FlickrPublishing.c"
 	} else {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1298 "FlickrPublishing.c"
+#line 1164 "FlickrPublishing.c"
 	}
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_visibility_specification_unref (old);
-#line 1304 "FlickrPublishing.c"
+#line 1170 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_visibility_specification_class_init (PublishingFlickrVisibilitySpecificationClass * klass) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_visibility_specification_parent_class = g_type_class_peek_parent (klass);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingFlickrVisibilitySpecificationClass *) klass)->finalize = publishing_flickr_visibility_specification_finalize;
-#line 1314 "FlickrPublishing.c"
+#line 1180 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_visibility_specification_instance_init (PublishingFlickrVisibilitySpecification * self) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->ref_count = 1;
-#line 1321 "FlickrPublishing.c"
+#line 1187 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_visibility_specification_finalize (PublishingFlickrVisibilitySpecification* obj) {
 	PublishingFlickrVisibilitySpecification * self;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION, PublishingFlickrVisibilitySpecification);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 1331 "FlickrPublishing.c"
+#line 1197 "FlickrPublishing.c"
 }
 
 
@@ -1354,252 +1214,252 @@ GType publishing_flickr_visibility_specification_get_type (void) {
 gpointer publishing_flickr_visibility_specification_ref (gpointer instance) {
 	PublishingFlickrVisibilitySpecification* self;
 	self = instance;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return instance;
-#line 1356 "FlickrPublishing.c"
+#line 1222 "FlickrPublishing.c"
 }
 
 
 void publishing_flickr_visibility_specification_unref (gpointer instance) {
 	PublishingFlickrVisibilitySpecification* self;
 	self = instance;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		PUBLISHING_FLICKR_VISIBILITY_SPECIFICATION_GET_CLASS (self)->finalize (self);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1369 "FlickrPublishing.c"
+#line 1235 "FlickrPublishing.c"
 	}
 }
 
 
 PublishingFlickrPublishingParameters* publishing_flickr_publishing_parameters_construct (GType object_type) {
 	PublishingFlickrPublishingParameters* self = NULL;
-#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrPublishingParameters*) g_type_create_instance (object_type);
-#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 1380 "FlickrPublishing.c"
+#line 1246 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrPublishingParameters* publishing_flickr_publishing_parameters_new (void) {
-#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_publishing_parameters_construct (PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS);
-#line 1387 "FlickrPublishing.c"
+#line 1253 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_value_publishing_parameters_init (GValue* value) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 1394 "FlickrPublishing.c"
+#line 1260 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_value_publishing_parameters_free_value (GValue* value) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_parameters_unref (value->data[0].v_pointer);
-#line 1403 "FlickrPublishing.c"
+#line 1269 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_value_publishing_parameters_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_flickr_publishing_parameters_ref (src_value->data[0].v_pointer);
-#line 1413 "FlickrPublishing.c"
+#line 1279 "FlickrPublishing.c"
 	} else {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1417 "FlickrPublishing.c"
+#line 1283 "FlickrPublishing.c"
 	}
 }
 
 
 static gpointer publishing_flickr_value_publishing_parameters_peek_pointer (const GValue* value) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1425 "FlickrPublishing.c"
+#line 1291 "FlickrPublishing.c"
 }
 
 
 static gchar* publishing_flickr_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 1432 "FlickrPublishing.c"
+#line 1298 "FlickrPublishing.c"
 		PublishingFlickrPublishingParameters* object;
 		object = collect_values[0].v_pointer;
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1439 "FlickrPublishing.c"
+#line 1305 "FlickrPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 1443 "FlickrPublishing.c"
+#line 1309 "FlickrPublishing.c"
 		}
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = publishing_flickr_publishing_parameters_ref (object);
-#line 1447 "FlickrPublishing.c"
+#line 1313 "FlickrPublishing.c"
 	} else {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1451 "FlickrPublishing.c"
+#line 1317 "FlickrPublishing.c"
 	}
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 1455 "FlickrPublishing.c"
+#line 1321 "FlickrPublishing.c"
 }
 
 
 static gchar* publishing_flickr_value_publishing_parameters_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingFlickrPublishingParameters** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!object_p) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1466 "FlickrPublishing.c"
+#line 1332 "FlickrPublishing.c"
 	}
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = NULL;
-#line 1472 "FlickrPublishing.c"
+#line 1338 "FlickrPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1476 "FlickrPublishing.c"
+#line 1342 "FlickrPublishing.c"
 	} else {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = publishing_flickr_publishing_parameters_ref (value->data[0].v_pointer);
-#line 1480 "FlickrPublishing.c"
+#line 1346 "FlickrPublishing.c"
 	}
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 1484 "FlickrPublishing.c"
+#line 1350 "FlickrPublishing.c"
 }
 
 
 GParamSpec* publishing_flickr_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingFlickrParamSpecPublishingParameters* spec;
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS), NULL);
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 1498 "FlickrPublishing.c"
+#line 1364 "FlickrPublishing.c"
 }
 
 
 gpointer publishing_flickr_value_get_publishing_parameters (const GValue* value) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS), NULL);
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1507 "FlickrPublishing.c"
+#line 1373 "FlickrPublishing.c"
 }
 
 
 void publishing_flickr_value_set_publishing_parameters (GValue* value, gpointer v_object) {
 	PublishingFlickrPublishingParameters* old;
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS));
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (v_object) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS));
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_parameters_ref (value->data[0].v_pointer);
-#line 1527 "FlickrPublishing.c"
+#line 1393 "FlickrPublishing.c"
 	} else {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1531 "FlickrPublishing.c"
+#line 1397 "FlickrPublishing.c"
 	}
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_parameters_unref (old);
-#line 1537 "FlickrPublishing.c"
+#line 1403 "FlickrPublishing.c"
 	}
 }
 
 
 void publishing_flickr_value_take_publishing_parameters (GValue* value, gpointer v_object) {
 	PublishingFlickrPublishingParameters* old;
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS));
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (v_object) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS));
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1556 "FlickrPublishing.c"
+#line 1422 "FlickrPublishing.c"
 	} else {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1560 "FlickrPublishing.c"
+#line 1426 "FlickrPublishing.c"
 	}
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_parameters_unref (old);
-#line 1566 "FlickrPublishing.c"
+#line 1432 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_publishing_parameters_class_init (PublishingFlickrPublishingParametersClass * klass) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_parameters_parent_class = g_type_class_peek_parent (klass);
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingFlickrPublishingParametersClass *) klass)->finalize = publishing_flickr_publishing_parameters_finalize;
-#line 1576 "FlickrPublishing.c"
+#line 1442 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_parameters_instance_init (PublishingFlickrPublishingParameters * self) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->ref_count = 1;
-#line 1583 "FlickrPublishing.c"
+#line 1449 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_parameters_finalize (PublishingFlickrPublishingParameters* obj) {
 	PublishingFlickrPublishingParameters * self;
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS, PublishingFlickrPublishingParameters);
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->username);
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (self->visibility_specification);
-#line 1597 "FlickrPublishing.c"
+#line 1463 "FlickrPublishing.c"
 }
 
 
@@ -1620,32 +1480,32 @@ GType publishing_flickr_publishing_parameters_get_type (void) {
 gpointer publishing_flickr_publishing_parameters_ref (gpointer instance) {
 	PublishingFlickrPublishingParameters* self;
 	self = instance;
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return instance;
-#line 1622 "FlickrPublishing.c"
+#line 1488 "FlickrPublishing.c"
 }
 
 
 void publishing_flickr_publishing_parameters_unref (gpointer instance) {
 	PublishingFlickrPublishingParameters* self;
 	self = instance;
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		PUBLISHING_FLICKR_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self);
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1635 "FlickrPublishing.c"
+#line 1501 "FlickrPublishing.c"
 	}
 }
 
 
-static void _publishing_flickr_flickr_publisher_on_session_authenticated_publishing_rest_support_session_authenticated (PublishingRESTSupportSession* _sender, gpointer self) {
-#line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void _publishing_flickr_flickr_publisher_on_session_authenticated_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender, gpointer self) {
+#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_session_authenticated ((PublishingFlickrFlickrPublisher*) self);
-#line 1643 "FlickrPublishing.c"
+#line 1509 "FlickrPublishing.c"
 }
 
 
@@ -1657,238 +1517,93 @@ PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_construct (G
 	SpitPublishingPluginHost* _tmp3_ = NULL;
 	PublishingFlickrSession* _tmp4_ = NULL;
 	PublishingFlickrPublishingParameters* _tmp5_ = NULL;
-	PublishingFlickrSession* _tmp6_ = NULL;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	PublishingAuthenticatorFactory* _tmp6_ = NULL;
+	PublishingAuthenticatorFactory* _tmp7_ = NULL;
+	SpitPublishingPluginHost* _tmp8_ = NULL;
+	SpitPublishingAuthenticator* _tmp9_ = NULL;
+	SpitPublishingAuthenticator* _tmp10_ = NULL;
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrFlickrPublisher*) g_object_new (object_type, NULL);
-#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:112: FlickrPublisher instantiated.");
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:107: FlickrPublisher instantiated.");
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = service;
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->service);
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->service = _tmp1_;
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = host;
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->host);
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->host = _tmp3_;
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = publishing_flickr_session_new ();
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->session = _tmp4_;
-#line 116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = publishing_flickr_publishing_parameters_new ();
-#line 116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
-#line 116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->parameters = _tmp5_;
-#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6_ = self->priv->session;
-#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated", (GCallback) _publishing_flickr_flickr_publisher_on_session_authenticated_publishing_rest_support_session_authenticated, self, 0);
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp6_ = publishing_authenticator_factory_get_instance ();
+#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp7_ = _tmp6_;
+#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp8_ = host;
+#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp9_ = spit_publishing_authenticator_factory_create (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY, SpitPublishingAuthenticatorFactory), "flickr", _tmp8_);
+#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_object_unref0 (self->priv->authenticator);
+#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->authenticator = _tmp9_;
+#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_object_unref0 (_tmp7_);
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp10_ = self->priv->authenticator;
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_signal_connect_object (_tmp10_, "authenticated", (GCallback) _publishing_flickr_flickr_publisher_on_session_authenticated_spit_publishing_authenticator_authenticated, self, 0);
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 1698 "FlickrPublishing.c"
+#line 1582 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_flickr_publisher_construct (PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, service, host);
-#line 1705 "FlickrPublishing.c"
+#line 1589 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_flickr_publisher_invalidate_persistent_session (PublishingFlickrFlickrPublisher* self) {
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_set_persistent_access_phase_token (self, "");
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_set_persistent_access_phase_token_secret (self, "");
-#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_set_persistent_access_phase_username (self, "");
-#line 1718 "FlickrPublishing.c"
-}
-
-
-static gboolean publishing_flickr_flickr_publisher_is_persistent_session_valid (PublishingFlickrFlickrPublisher* self) {
-	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), FALSE);
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = publishing_flickr_flickr_publisher_get_persistent_access_phase_username (self);
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = _tmp2_;
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = _tmp3_ != NULL;
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp3_);
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp4_) {
-#line 1741 "FlickrPublishing.c"
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp5_ = publishing_flickr_flickr_publisher_get_persistent_access_phase_token (self);
-#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp6_ = _tmp5_;
-#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp1_ = _tmp6_ != NULL;
-#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_free0 (_tmp6_);
-#line 1752 "FlickrPublishing.c"
-	} else {
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp1_ = FALSE;
-#line 1756 "FlickrPublishing.c"
-	}
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp1_) {
-#line 1760 "FlickrPublishing.c"
-		gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp7_ = publishing_flickr_flickr_publisher_get_persistent_access_phase_token_secret (self);
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp8_ = _tmp7_;
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp0_ = _tmp8_ != NULL;
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_free0 (_tmp8_);
-#line 1771 "FlickrPublishing.c"
-	} else {
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp0_ = FALSE;
-#line 1775 "FlickrPublishing.c"
-	}
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	result = _tmp0_;
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return result;
-#line 1781 "FlickrPublishing.c"
-}
-
-
-static gchar* publishing_flickr_flickr_publisher_get_persistent_access_phase_username (PublishingFlickrFlickrPublisher* self) {
-	gchar* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+SpitPublishingAuthenticator* publishing_flickr_flickr_publisher_get_authenticator (PublishingFlickrFlickrPublisher* self) {
+	SpitPublishingAuthenticator* result = NULL;
+	SpitPublishingAuthenticator* _tmp0_ = NULL;
+	SpitPublishingAuthenticator* _tmp1_ = NULL;
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), NULL);
-#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_username", NULL);
-#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	result = _tmp1_;
-#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return result;
-#line 1799 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_flickr_publisher_set_persistent_access_phase_username (PublishingFlickrFlickrPublisher* self, const gchar* username) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (username != NULL);
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = username;
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_username", _tmp1_);
-#line 1816 "FlickrPublishing.c"
-}
-
-
-static gchar* publishing_flickr_flickr_publisher_get_persistent_access_phase_token (PublishingFlickrFlickrPublisher* self) {
-	gchar* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), NULL);
-#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_token", NULL);
-#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	result = _tmp1_;
-#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return result;
-#line 1834 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_flickr_publisher_set_persistent_access_phase_token (PublishingFlickrFlickrPublisher* self, const gchar* token) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (token != NULL);
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = token;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_token", _tmp1_);
-#line 1851 "FlickrPublishing.c"
-}
-
-
-static gchar* publishing_flickr_flickr_publisher_get_persistent_access_phase_token_secret (PublishingFlickrFlickrPublisher* self) {
-	gchar* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), NULL);
-#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_token_secret", NULL);
-#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp0_ = self->priv->authenticator;
+#line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp1_;
-#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 1869 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_flickr_publisher_set_persistent_access_phase_token_secret (PublishingFlickrFlickrPublisher* self, const gchar* secret) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (secret != NULL);
-#line 158 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 158 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = secret;
-#line 158 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_token_secret", _tmp1_);
-#line 1886 "FlickrPublishing.c"
+#line 1607 "FlickrPublishing.c"
 }
 
 
@@ -1896,468 +1611,228 @@ static gboolean publishing_flickr_flickr_publisher_get_persistent_strip_metadata
 	gboolean result = FALSE;
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), FALSE);
-#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", FALSE);
-#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp1_;
-#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 1904 "FlickrPublishing.c"
+#line 1625 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_set_persistent_strip_metadata (PublishingFlickrFlickrPublisher* self, gboolean strip_metadata) {
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = strip_metadata;
-#line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", _tmp1_);
-#line 1919 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_flickr_publisher_on_welcome_pane_login_clicked (PublishingFlickrFlickrPublisher* self) {
-	gboolean _tmp0_ = FALSE;
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->running;
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (!_tmp0_) {
-#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		return;
-#line 1933 "FlickrPublishing.c"
-	}
-#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:173: EVENT: user clicked 'Login' button in the w" \
-"elcome pane");
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_do_run_authentication_request_transaction (self);
-#line 1939 "FlickrPublishing.c"
+#line 1640 "FlickrPublishing.c"
 }
 
 
-static void _publishing_flickr_flickr_publisher_on_auth_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_on_auth_request_txn_completed ((PublishingFlickrFlickrPublisher*) self, _sender);
-#line 1946 "FlickrPublishing.c"
-}
-
-
-static void _publishing_flickr_flickr_publisher_on_auth_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_on_auth_request_txn_error ((PublishingFlickrFlickrPublisher*) self, _sender, err);
-#line 1953 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_flickr_publisher_on_auth_request_txn_completed (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	PublishingRESTSupportTransaction* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	PublishingRESTSupportTransaction* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = txn;
-#line 179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_auth_request_txn_completed_publishing_rest_support_transaction_completed, self);
-#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = txn;
-#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_auth_request_txn_error_publishing_rest_support_transaction_network_error, self);
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (!_tmp4_) {
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		return;
-#line 1991 "FlickrPublishing.c"
-	}
-#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = txn;
-#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6_ = publishing_rest_support_transaction_get_response (_tmp5_);
-#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp7_ = _tmp6_;
-#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:185: EVENT: OAuth authentication request transac" \
-"tion completed; response = '%s'", _tmp7_);
-#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp7_);
-#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp8_ = txn;
-#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp9_ = publishing_rest_support_transaction_get_response (_tmp8_);
-#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp10_ = _tmp9_;
-#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_do_parse_token_info_from_auth_request (self, _tmp10_);
-#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp10_);
-#line 2013 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_flickr_publisher_on_auth_request_txn_error (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportTransaction* txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	SpitPublishingPluginHost* _tmp5_ = NULL;
-	GError* _tmp6_ = NULL;
-#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = txn;
-#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_auth_request_txn_completed_publishing_rest_support_transaction_completed, self);
-#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = txn;
-#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_auth_request_txn_error_publishing_rest_support_transaction_network_error, self);
-#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (!_tmp4_) {
-#line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		return;
-#line 2047 "FlickrPublishing.c"
-	}
-#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:199: EVENT: OAuth authentication request transac" \
-"tion caused a network error");
-#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = self->priv->host;
-#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6_ = err;
-#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_);
-#line 2057 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_flickr_publisher_on_authentication_token_available (PublishingFlickrFlickrPublisher* self, const gchar* token, const gchar* token_secret) {
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	PublishingFlickrSession* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (token != NULL);
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (token_secret != NULL);
-#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = token;
-#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = token_secret;
-#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:204: EVENT: OAuth authentication token (%s) and " \
-"token secret (%s) available", _tmp0_, _tmp1_);
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = self->priv->session;
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = token;
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = token_secret;
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_session_set_request_phase_credentials (_tmp2_, _tmp3_, _tmp4_);
-#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = token;
-#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_do_launch_system_browser (self, _tmp5_);
-#line 2092 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_flickr_publisher_on_system_browser_launched (PublishingFlickrFlickrPublisher* self) {
-	gboolean _tmp0_ = FALSE;
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (!_tmp0_) {
-#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		return;
-#line 2106 "FlickrPublishing.c"
-	}
-#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:216: EVENT: system browser launched.");
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_do_show_pin_entry_pane (self);
-#line 2112 "FlickrPublishing.c"
-}
-
-
-static void _publishing_flickr_flickr_publisher_on_pin_entry_proceed_publishing_flickr_pin_entry_pane_proceed (PublishingFlickrPinEntryPane* _sender, PublishingFlickrPinEntryPane* sender, const gchar* authorization_pin, gpointer self) {
-#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_on_pin_entry_proceed ((PublishingFlickrFlickrPublisher*) self, sender, authorization_pin);
-#line 2119 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_flickr_publisher_on_pin_entry_proceed (PublishingFlickrFlickrPublisher* self, PublishingFlickrPinEntryPane* sender, const gchar* pin) {
-	PublishingFlickrPinEntryPane* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	gboolean _tmp2_ = FALSE;
-	const gchar* _tmp3_ = NULL;
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_PIN_ENTRY_PANE (sender));
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (pin != NULL);
-#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = sender;
-#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_parse_name ("proceed", PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, &_tmp1_, NULL, FALSE);
-#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_pin_entry_proceed_publishing_flickr_pin_entry_pane_proceed, self);
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (!_tmp2_) {
-#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		return;
-#line 2146 "FlickrPublishing.c"
-	}
-#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:227: EVENT: user clicked 'Continue' in PIN entry" \
-" pane.");
-#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = pin;
-#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_do_verify_pin (self, _tmp3_);
-#line 2154 "FlickrPublishing.c"
-}
-
-
-static void _publishing_flickr_flickr_publisher_on_access_token_fetch_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_on_access_token_fetch_txn_completed ((PublishingFlickrFlickrPublisher*) self, _sender);
-#line 2161 "FlickrPublishing.c"
-}
-
-
-static void _publishing_flickr_flickr_publisher_on_access_token_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_on_access_token_fetch_error ((PublishingFlickrFlickrPublisher*) self, _sender, err);
-#line 2168 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_flickr_publisher_on_access_token_fetch_txn_completed (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	PublishingRESTSupportTransaction* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = txn;
-#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_access_token_fetch_txn_completed_publishing_rest_support_transaction_completed, self);
-#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = txn;
-#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_access_token_fetch_error_publishing_rest_support_transaction_network_error, self);
-#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (!_tmp4_) {
-#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		return;
-#line 2203 "FlickrPublishing.c"
-	}
-#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:239: EVENT: fetching OAuth access token over the" \
-" network succeeded");
-#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = txn;
-#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6_ = publishing_rest_support_transaction_get_response (_tmp5_);
-#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp7_ = _tmp6_;
-#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_do_extract_access_phase_credentials_from_reponse (self, _tmp7_);
-#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp7_);
-#line 2217 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_flickr_publisher_on_access_token_fetch_error (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportTransaction* txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	SpitPublishingPluginHost* _tmp5_ = NULL;
-	GError* _tmp6_ = NULL;
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = txn;
-#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_access_token_fetch_txn_completed_publishing_rest_support_transaction_completed, self);
-#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = txn;
-#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_access_token_fetch_error_publishing_rest_support_transaction_network_error, self);
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (!_tmp4_) {
-#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		return;
-#line 2251 "FlickrPublishing.c"
-	}
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:252: EVENT: fetching OAuth access token over the" \
-" network caused an error.");
-#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = self->priv->host;
-#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6_ = err;
-#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_);
-#line 2261 "FlickrPublishing.c"
+static gpointer _g_variant_ref0 (gpointer self) {
+#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	return self ? g_variant_ref (self) : NULL;
+#line 1647 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_on_session_authenticated (PublishingFlickrFlickrPublisher* self) {
 	gboolean _tmp0_ = FALSE;
-	PublishingFlickrPublishingParameters* _tmp1_ = NULL;
-	PublishingFlickrSession* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	PublishingFlickrSession* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	PublishingFlickrSession* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	PublishingFlickrSession* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	GHashTable* params = NULL;
+	SpitPublishingAuthenticator* _tmp1_ = NULL;
+	GHashTable* _tmp2_ = NULL;
+	GVariant* consumer_key = NULL;
+	GVariant* consumer_secret = NULL;
+	GVariant* auth_token = NULL;
+	GVariant* auth_token_secret = NULL;
+	GVariant* username = NULL;
+	GHashTable* _tmp3_ = NULL;
+	gconstpointer _tmp4_ = NULL;
+	GVariant* _tmp5_ = NULL;
+	GHashTable* _tmp6_ = NULL;
+	gconstpointer _tmp7_ = NULL;
+	GVariant* _tmp8_ = NULL;
+	PublishingFlickrSession* _tmp9_ = NULL;
+	GVariant* _tmp10_ = NULL;
+	const gchar* _tmp11_ = NULL;
+	GVariant* _tmp12_ = NULL;
+	const gchar* _tmp13_ = NULL;
+	GHashTable* _tmp14_ = NULL;
+	gconstpointer _tmp15_ = NULL;
+	GVariant* _tmp16_ = NULL;
+	GHashTable* _tmp17_ = NULL;
+	gconstpointer _tmp18_ = NULL;
+	GVariant* _tmp19_ = NULL;
+	GHashTable* _tmp20_ = NULL;
+	gconstpointer _tmp21_ = NULL;
+	GVariant* _tmp22_ = NULL;
+	PublishingFlickrSession* _tmp23_ = NULL;
+	GVariant* _tmp24_ = NULL;
+	const gchar* _tmp25_ = NULL;
+	GVariant* _tmp26_ = NULL;
+	const gchar* _tmp27_ = NULL;
+	GVariant* _tmp28_ = NULL;
+	const gchar* _tmp29_ = NULL;
+	PublishingFlickrPublishingParameters* _tmp30_ = NULL;
+	PublishingFlickrSession* _tmp31_ = NULL;
+	gchar* _tmp32_ = NULL;
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!_tmp0_) {
-#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2287 "FlickrPublishing.c"
+#line 1699 "FlickrPublishing.c"
 	}
-#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:261: EVENT: a fully authenticated session has be" \
+#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:137: EVENT: a fully authenticated session has be" \
 "come available");
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = self->priv->parameters;
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = self->priv->session;
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = publishing_flickr_session_get_username (_tmp2_);
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp1_->username);
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_->username = _tmp3_;
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = self->priv->session;
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = publishing_flickr_session_get_access_phase_token (_tmp4_);
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6_ = _tmp5_;
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_set_persistent_access_phase_token (self, _tmp6_);
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp6_);
-#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp7_ = self->priv->session;
-#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp8_ = publishing_flickr_session_get_access_phase_token_secret (_tmp7_);
-#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp9_ = _tmp8_;
-#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_set_persistent_access_phase_token_secret (self, _tmp9_);
-#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp9_);
-#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp10_ = self->priv->session;
-#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp11_ = publishing_flickr_session_get_username (_tmp10_);
-#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp12_ = _tmp11_;
-#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_set_persistent_access_phase_username (self, _tmp12_);
-#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp12_);
-#line 269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp1_ = self->priv->authenticator;
+#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp2_ = spit_publishing_authenticator_get_authentication_parameter (_tmp1_);
+#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	params = _tmp2_;
+#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	consumer_key = NULL;
+#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	consumer_secret = NULL;
+#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	auth_token = NULL;
+#line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	auth_token_secret = NULL;
+#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	username = NULL;
+#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp3_ = params;
+#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_hash_table_lookup_extended (_tmp3_, "ConsumerKey", NULL, &_tmp4_);
+#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_variant_unref0 (consumer_key);
+#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp5_ = _g_variant_ref0 (_tmp4_);
+#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	consumer_key = _tmp5_;
+#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp6_ = params;
+#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_hash_table_lookup_extended (_tmp6_, "ConsumerSecret", NULL, &_tmp7_);
+#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_variant_unref0 (consumer_secret);
+#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp8_ = _g_variant_ref0 (_tmp7_);
+#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	consumer_secret = _tmp8_;
+#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp9_ = self->priv->session;
+#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp10_ = consumer_key;
+#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp11_ = g_variant_get_string (_tmp10_, NULL);
+#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp12_ = consumer_secret;
+#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp13_ = g_variant_get_string (_tmp12_, NULL);
+#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	publishing_flickr_session_set_api_credentials (_tmp9_, _tmp11_, _tmp13_);
+#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp14_ = params;
+#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_hash_table_lookup_extended (_tmp14_, "AuthToken", NULL, &_tmp15_);
+#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_variant_unref0 (auth_token);
+#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp16_ = _g_variant_ref0 (_tmp15_);
+#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	auth_token = _tmp16_;
+#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp17_ = params;
+#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_hash_table_lookup_extended (_tmp17_, "AuthTokenSecret", NULL, &_tmp18_);
+#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_variant_unref0 (auth_token_secret);
+#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp19_ = _g_variant_ref0 (_tmp18_);
+#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	auth_token_secret = _tmp19_;
+#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp20_ = params;
+#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_hash_table_lookup_extended (_tmp20_, "Username", NULL, &_tmp21_);
+#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_variant_unref0 (username);
+#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp22_ = _g_variant_ref0 (_tmp21_);
+#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	username = _tmp22_;
+#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp23_ = self->priv->session;
+#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp24_ = auth_token;
+#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp25_ = g_variant_get_string (_tmp24_, NULL);
+#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp26_ = auth_token_secret;
+#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp27_ = g_variant_get_string (_tmp26_, NULL);
+#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp28_ = username;
+#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp29_ = g_variant_get_string (_tmp28_, NULL);
+#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	publishing_flickr_session_set_access_phase_credentials (_tmp23_, _tmp25_, _tmp27_, _tmp29_);
+#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp30_ = self->priv->parameters;
+#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp31_ = self->priv->session;
+#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp32_ = publishing_flickr_session_get_username (_tmp31_);
+#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_free0 (_tmp30_->username);
+#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp30_->username = _tmp32_;
+#line 158 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_do_fetch_account_info (self);
-#line 2333 "FlickrPublishing.c"
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_variant_unref0 (username);
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_variant_unref0 (auth_token_secret);
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_variant_unref0 (auth_token);
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_variant_unref0 (consumer_secret);
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_variant_unref0 (consumer_key);
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_hash_table_unref0 (params);
+#line 1821 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_flickr_publisher_on_account_fetch_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_account_fetch_txn_completed ((PublishingFlickrFlickrPublisher*) self, _sender);
-#line 2340 "FlickrPublishing.c"
+#line 1828 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_flickr_publisher_on_account_fetch_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_account_fetch_txn_error ((PublishingFlickrFlickrPublisher*) self, _sender, err);
-#line 2347 "FlickrPublishing.c"
+#line 1835 "FlickrPublishing.c"
 }
 
 
@@ -2370,44 +1845,44 @@ static void publishing_flickr_flickr_publisher_on_account_fetch_txn_completed (P
 	PublishingRESTSupportTransaction* _tmp5_ = NULL;
 	gchar* _tmp6_ = NULL;
 	gchar* _tmp7_ = NULL;
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = txn;
-#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_account_fetch_txn_completed_publishing_rest_support_transaction_completed, self);
-#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = txn;
-#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_account_fetch_txn_error_publishing_rest_support_transaction_network_error, self);
-#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!_tmp4_) {
-#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2382 "FlickrPublishing.c"
+#line 1870 "FlickrPublishing.c"
 	}
-#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:279: EVENT: account fetch transaction response r" \
+#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:168: EVENT: account fetch transaction response r" \
 "eceived over the network");
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = txn;
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = publishing_rest_support_transaction_get_response (_tmp5_);
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = _tmp6_;
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (self, _tmp7_);
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp7_);
-#line 2396 "FlickrPublishing.c"
+#line 1884 "FlickrPublishing.c"
 }
 
 
@@ -2419,75 +1894,75 @@ static void publishing_flickr_flickr_publisher_on_account_fetch_txn_error (Publi
 	gboolean _tmp4_ = FALSE;
 	SpitPublishingPluginHost* _tmp5_ = NULL;
 	GError* _tmp6_ = NULL;
-#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = txn;
-#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_account_fetch_txn_completed_publishing_rest_support_transaction_completed, self);
-#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = txn;
-#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_account_fetch_txn_error_publishing_rest_support_transaction_network_error, self);
-#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!_tmp4_) {
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2430 "FlickrPublishing.c"
+#line 1918 "FlickrPublishing.c"
 	}
-#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:291: EVENT: account fetch transaction caused a n" \
+#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:180: EVENT: account fetch transaction caused a n" \
 "etwork error");
-#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = self->priv->host;
-#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = err;
-#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_);
-#line 2440 "FlickrPublishing.c"
+#line 1928 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_on_account_info_available (PublishingFlickrFlickrPublisher* self) {
 	gboolean _tmp0_ = FALSE;
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!_tmp0_) {
-#line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2454 "FlickrPublishing.c"
+#line 1942 "FlickrPublishing.c"
 	}
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:299: EVENT: account information has become avail" \
+#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:188: EVENT: account information has become avail" \
 "able");
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_do_show_publishing_options_pane (self);
-#line 2460 "FlickrPublishing.c"
+#line 1948 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_flickr_publisher_on_publishing_options_pane_publish_publishing_flickr_publishing_options_pane_publish (PublishingFlickrPublishingOptionsPane* _sender, gboolean strip_metadata, gpointer self) {
-#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_publishing_options_pane_publish ((PublishingFlickrFlickrPublisher*) self, strip_metadata);
-#line 2467 "FlickrPublishing.c"
+#line 1955 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_flickr_publisher_on_publishing_options_pane_logout_publishing_flickr_publishing_options_pane_logout (PublishingFlickrPublishingOptionsPane* _sender, gpointer self) {
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_publishing_options_pane_logout ((PublishingFlickrFlickrPublisher*) self);
-#line 2474 "FlickrPublishing.c"
+#line 1962 "FlickrPublishing.c"
 }
 
 
@@ -2498,36 +1973,36 @@ static void publishing_flickr_flickr_publisher_on_publishing_options_pane_publis
 	guint _tmp3_ = 0U;
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp5_ = FALSE;
-#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->publishing_options_pane;
-#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("publish", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE);
-#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_publishing_options_pane_publish_publishing_flickr_publishing_options_pane_publish, self);
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = self->priv->publishing_options_pane;
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("logout", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp3_, NULL, FALSE);
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_publishing_options_pane_logout_publishing_flickr_publishing_options_pane_logout, self);
-#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!_tmp4_) {
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2505 "FlickrPublishing.c"
+#line 1993 "FlickrPublishing.c"
 	}
-#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:310: EVENT: user clicked the 'Publish' button in" \
+#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:199: EVENT: user clicked the 'Publish' button in" \
 " the publishing options pane");
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = strip_metadata;
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_do_publish (self, _tmp5_);
-#line 2513 "FlickrPublishing.c"
+#line 2001 "FlickrPublishing.c"
 }
 
 
@@ -2537,34 +2012,34 @@ static void publishing_flickr_flickr_publisher_on_publishing_options_pane_logout
 	PublishingFlickrPublishingOptionsPane* _tmp2_ = NULL;
 	guint _tmp3_ = 0U;
 	gboolean _tmp4_ = FALSE;
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->publishing_options_pane;
-#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("publish", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE);
-#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_publishing_options_pane_publish_publishing_flickr_publishing_options_pane_publish, self);
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = self->priv->publishing_options_pane;
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("logout", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp3_, NULL, FALSE);
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_publishing_options_pane_logout_publishing_flickr_publishing_options_pane_logout, self);
-#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!_tmp4_) {
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2543 "FlickrPublishing.c"
+#line 2031 "FlickrPublishing.c"
 	}
-#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:321: EVENT: user clicked the 'Logout' button in " \
+#line 210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:210: EVENT: user clicked the 'Logout' button in " \
 "the publishing options pane");
-#line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_do_logout (self);
-#line 2549 "FlickrPublishing.c"
+#line 2037 "FlickrPublishing.c"
 }
 
 
@@ -2577,52 +2052,52 @@ static void publishing_flickr_flickr_publisher_on_upload_status_updated (Publish
 	void* _tmp3__target = NULL;
 	gint _tmp4_ = 0;
 	gdouble _tmp5_ = 0.0;
-#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!_tmp0_) {
-#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2570 "FlickrPublishing.c"
+#line 2058 "FlickrPublishing.c"
 	}
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = completed_fraction;
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:330: EVENT: uploader reports upload %.2f percent" \
+#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:219: EVENT: uploader reports upload %.2f percent" \
 " complete.", 100.0 * _tmp1_);
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = self->priv->progress_reporter;
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2__target = self->priv->progress_reporter_target;
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_vala_assert (_tmp2_ != NULL, "progress_reporter != null");
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = self->priv->progress_reporter;
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3__target = self->priv->progress_reporter_target;
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = file_number;
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = completed_fraction;
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 2592 "FlickrPublishing.c"
+#line 2080 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_flickr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) {
-#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_upload_complete ((PublishingFlickrFlickrPublisher*) self, _sender, num_photos_published);
-#line 2599 "FlickrPublishing.c"
+#line 2087 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_flickr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) {
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_upload_error ((PublishingFlickrFlickrPublisher*) self, _sender, err);
-#line 2606 "FlickrPublishing.c"
+#line 2094 "FlickrPublishing.c"
 }
 
 
@@ -2633,38 +2108,38 @@ static void publishing_flickr_flickr_publisher_on_upload_complete (PublishingFli
 	guint _tmp3_ = 0U;
 	PublishingRESTSupportBatchUploader* _tmp4_ = NULL;
 	guint _tmp5_ = 0U;
-#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!_tmp0_) {
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2627 "FlickrPublishing.c"
+#line 2115 "FlickrPublishing.c"
 	}
-#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = num_published;
-#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:342: EVENT: uploader reports upload complete; %d" \
+#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:231: EVENT: uploader reports upload complete; %d" \
 " items published.", _tmp1_);
-#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = uploader;
-#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
-#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = uploader;
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp5_, NULL, FALSE);
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
-#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_do_show_success_pane (self);
-#line 2647 "FlickrPublishing.c"
+#line 2135 "FlickrPublishing.c"
 }
 
 
@@ -2678,753 +2153,44 @@ static void publishing_flickr_flickr_publisher_on_upload_error (PublishingFlickr
 	guint _tmp6_ = 0U;
 	SpitPublishingPluginHost* _tmp7_ = NULL;
 	GError* _tmp8_ = NULL;
-#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
-#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!_tmp0_) {
-#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2671 "FlickrPublishing.c"
+#line 2159 "FlickrPublishing.c"
 	}
-#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = err;
-#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = _tmp1_->message;
-#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:355: EVENT: uploader reports upload error = '%s'" \
+#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:244: EVENT: uploader reports upload error = '%s'" \
 ".", _tmp2_);
-#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = uploader;
-#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp4_, NULL, FALSE);
-#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
-#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = uploader;
-#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp6_, NULL, FALSE);
-#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp5_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
-#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = self->priv->host;
-#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = err;
-#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 2697 "FlickrPublishing.c"
-}
-
-
-static void _publishing_flickr_flickr_publisher_on_welcome_pane_login_clicked_spit_publishing_login_callback (gpointer self) {
-#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_on_welcome_pane_login_clicked ((PublishingFlickrFlickrPublisher*) self);
-#line 2704 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_flickr_publisher_do_show_login_welcome_pane (PublishingFlickrFlickrPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:364: ACTION: installing login welcome pane");
-#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
-#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = self->priv->host;
-#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	spit_publishing_plugin_host_install_welcome_pane (_tmp1_, PUBLISHING_FLICKR_SERVICE_WELCOME_MESSAGE, _publishing_flickr_flickr_publisher_on_welcome_pane_login_clicked_spit_publishing_login_callback, self);
-#line 2723 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_flickr_publisher_do_run_authentication_request_transaction (PublishingFlickrFlickrPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PublishingFlickrAuthenticationRequestTransaction* txn = NULL;
-	PublishingFlickrSession* _tmp3_ = NULL;
-	PublishingFlickrAuthenticationRequestTransaction* _tmp4_ = NULL;
-	GError * _inner_error_ = NULL;
-#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:371: ACTION: running authentication request tran" \
-"saction");
-#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
-#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…");
-#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"
-	_tmp3_ = self->priv->session;
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = publishing_flickr_authentication_request_transaction_new (_tmp3_);
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	txn = _tmp4_;
-#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_flickr_flickr_publisher_on_auth_request_txn_completed_publishing_rest_support_transaction_completed, self, 0);
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_flickr_flickr_publisher_on_auth_request_txn_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 2759 "FlickrPublishing.c"
-	{
-#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2767 "FlickrPublishing.c"
-				goto __catch16_spit_publishing_publishing_error;
-			}
-#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_publishing_rest_support_transaction_unref0 (txn);
-#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			g_clear_error (&_inner_error_);
-#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			return;
-#line 2778 "FlickrPublishing.c"
-		}
-	}
-	goto __finally16;
-	__catch16_spit_publishing_publishing_error:
-	{
-		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp5_ = NULL;
-		GError* _tmp6_ = NULL;
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		err = _inner_error_;
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_inner_error_ = NULL;
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp5_ = self->priv->host;
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp6_ = err;
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_);
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_error_free0 (err);
-#line 2799 "FlickrPublishing.c"
-	}
-	__finally16:
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_publishing_rest_support_transaction_unref0 (txn);
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_clear_error (&_inner_error_);
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		return;
-#line 2812 "FlickrPublishing.c"
-	}
-#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_publishing_rest_support_transaction_unref0 (txn);
-#line 2816 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_flickr_publisher_do_parse_token_info_from_auth_request (PublishingFlickrFlickrPublisher* self, const gchar* response) {
-	const gchar* _tmp0_ = NULL;
-	gchar* oauth_token = NULL;
-	gchar* oauth_token_secret = NULL;
-	GHashTable* data = NULL;
-	const gchar* _tmp1_ = NULL;
-	GHashTable* _tmp2_ = NULL;
-	GHashTable* _tmp3_ = NULL;
-	gconstpointer _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	GHashTable* _tmp6_ = NULL;
-	gconstpointer _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gboolean _tmp9_ = FALSE;
-	const gchar* _tmp10_ = NULL;
-	const gchar* _tmp16_ = NULL;
-	const gchar* _tmp17_ = NULL;
-#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (response != NULL);
-#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = response;
-#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:388: ACTION: parsing authorization request respo" \
-"nse '%s' into token and secret", _tmp0_);
-#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	oauth_token = NULL;
-#line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	oauth_token_secret = NULL;
-#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = response;
-#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = soup_form_decode (_tmp1_);
-#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	data = _tmp2_;
-#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = data;
-#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_hash_table_lookup_extended (_tmp3_, "oauth_token", NULL, &_tmp4_);
-#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (oauth_token);
-#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = g_strdup (_tmp4_);
-#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	oauth_token = _tmp5_;
-#line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6_ = data;
-#line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_hash_table_lookup_extended (_tmp6_, "oauth_token_secret", NULL, &_tmp7_);
-#line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (oauth_token_secret);
-#line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp8_ = g_strdup (_tmp7_);
-#line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	oauth_token_secret = _tmp8_;
-#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp10_ = oauth_token;
-#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp10_ == NULL) {
-#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp9_ = TRUE;
-#line 2881 "FlickrPublishing.c"
-	} else {
-		const gchar* _tmp11_ = NULL;
-#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp11_ = oauth_token_secret;
-#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp9_ = _tmp11_ == NULL;
-#line 2888 "FlickrPublishing.c"
-	}
-#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp9_) {
-#line 2892 "FlickrPublishing.c"
-		SpitPublishingPluginHost* _tmp12_ = NULL;
-		const gchar* _tmp13_ = NULL;
-		GError* _tmp14_ = NULL;
-		GError* _tmp15_ = NULL;
-#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp12_ = self->priv->host;
-#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp13_ = response;
-#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp14_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "'%s' isn't a valid response to an OAuth authentication request", _tmp13_);
-#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp15_ = _tmp14_;
-#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp12_, _tmp15_);
-#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_error_free0 (_tmp15_);
-#line 2909 "FlickrPublishing.c"
-	}
-#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp16_ = oauth_token;
-#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp17_ = oauth_token_secret;
-#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_on_authentication_token_available (self, _tmp16_, _tmp17_);
-#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_hash_table_unref0 (data);
-#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (oauth_token_secret);
-#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (oauth_token);
-#line 2923 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_flickr_publisher_do_launch_system_browser (PublishingFlickrFlickrPublisher* self, const gchar* token) {
-	gchar* login_uri = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	GError * _inner_error_ = NULL;
-#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (token != NULL);
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = token;
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = g_strconcat ("https://www.flickr.com/services/oauth/authorize?oauth_token=", _tmp0_, NULL);
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = _tmp1_;
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = g_strconcat (_tmp2_, "&perms=write", NULL);
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = _tmp3_;
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp2_);
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	login_uri = _tmp4_;
-#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = login_uri;
-#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:409: ACTION: launching system browser with uri =" \
-" '%s'", _tmp5_);
-#line 2958 "FlickrPublishing.c"
-	{
-		const gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp6_ = login_uri;
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp7_ = g_strconcat ("xdg-open ", _tmp6_, NULL);
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp8_ = _tmp7_;
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_spawn_command_line_async (_tmp8_, &_inner_error_);
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_free0 (_tmp8_);
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			if (_inner_error_->domain == G_SPAWN_ERROR) {
-#line 2977 "FlickrPublishing.c"
-				goto __catch17_g_spawn_error;
-			}
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_g_free0 (login_uri);
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			g_clear_error (&_inner_error_);
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			return;
-#line 2988 "FlickrPublishing.c"
-		}
-	}
-	goto __finally17;
-	__catch17_g_spawn_error:
-	{
-		GError* e = NULL;
-		SpitPublishingPluginHost* _tmp9_ = NULL;
-		GError* _tmp10_ = NULL;
-		GError* _tmp11_ = NULL;
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		e = _inner_error_;
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_inner_error_ = NULL;
-#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp9_ = self->priv->host;
-#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp10_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, "couldn't launch system web browser to complete Flickr login");
-#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp11_ = _tmp10_;
-#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp9_, _tmp11_);
-#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_error_free0 (_tmp11_);
-#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_error_free0 (e);
-#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_free0 (login_uri);
-#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		return;
-#line 3018 "FlickrPublishing.c"
-	}
-	__finally17:
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_free0 (login_uri);
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_clear_error (&_inner_error_);
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		return;
-#line 3031 "FlickrPublishing.c"
-	}
-#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_on_system_browser_launched (self);
-#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (login_uri);
-#line 3037 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_flickr_publisher_do_show_pin_entry_pane (PublishingFlickrFlickrPublisher* self) {
-	GtkBuilder* builder = NULL;
-	GtkBuilder* _tmp0_ = NULL;
-	PublishingFlickrPinEntryPane* pin_entry_pane = NULL;
-	GtkBuilder* _tmp8_ = NULL;
-	PublishingFlickrPinEntryPane* _tmp9_ = NULL;
-	PublishingFlickrPinEntryPane* _tmp10_ = NULL;
-	SpitPublishingPluginHost* _tmp11_ = NULL;
-	PublishingFlickrPinEntryPane* _tmp12_ = NULL;
-	GError * _inner_error_ = NULL;
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:423: ACTION: showing PIN entry pane");
-#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = gtk_builder_new ();
-#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	builder = _tmp0_;
-#line 3059 "FlickrPublishing.c"
-	{
-		GtkBuilder* _tmp1_ = NULL;
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp1_ = builder;
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		gtk_builder_add_from_resource (_tmp1_, PLUGIN_RESOURCE_PATH "/" "flickr_pin_entry_pane.ui", &_inner_error_);
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3068 "FlickrPublishing.c"
-			goto __catch18_g_error;
-		}
-	}
-	goto __finally18;
-	__catch18_g_error:
-	{
-		GError* e = NULL;
-		GError* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
-		SpitPublishingPluginHost* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
-		GError* _tmp6_ = NULL;
-		GError* _tmp7_ = NULL;
-#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		e = _inner_error_;
-#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_inner_error_ = NULL;
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp2_ = e;
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp3_ = _tmp2_->message;
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_warning ("FlickrPublishing.vala:431: Could not parse UI file! Error: %s.", _tmp3_);
-#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp4_ = self->priv->host;
-#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp5_ = _ ("A file required for publishing is unavailable. Publishing to Flickr ca" \
-"n’t continue.");
-#line 432 "/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 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp7_ = _tmp6_;
-#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp4_, _tmp7_);
-#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_error_free0 (_tmp7_);
-#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_error_free0 (e);
-#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_object_unref0 (builder);
-#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		return;
-#line 3110 "FlickrPublishing.c"
-	}
-	__finally18:
-#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_object_unref0 (builder);
-#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_clear_error (&_inner_error_);
-#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		return;
-#line 3123 "FlickrPublishing.c"
-	}
-#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp8_ = builder;
-#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp9_ = publishing_flickr_pin_entry_pane_new (_tmp8_);
-#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	pin_entry_pane = _tmp9_;
-#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp10_ = pin_entry_pane;
-#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_connect_object (_tmp10_, "proceed", (GCallback) _publishing_flickr_flickr_publisher_on_pin_entry_proceed_publishing_flickr_pin_entry_pane_proceed, self, 0);
-#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp11_ = self->priv->host;
-#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp12_ = pin_entry_pane;
-#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	spit_publishing_plugin_host_install_dialog_pane (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_object_unref0 (pin_entry_pane);
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_object_unref0 (builder);
-#line 3145 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_flickr_publisher_do_verify_pin (PublishingFlickrFlickrPublisher* self, const gchar* pin) {
-	const gchar* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	SpitPublishingPluginHost* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	PublishingFlickrAccessTokenFetchTransaction* txn = NULL;
-	PublishingFlickrSession* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	PublishingFlickrAccessTokenFetchTransaction* _tmp6_ = NULL;
-	GError * _inner_error_ = NULL;
-#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (pin != NULL);
-#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = pin;
-#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:444: ACTION: validating authorization PIN %s", _tmp0_);
-#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = self->priv->host;
-#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp1_, TRUE);
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = self->priv->host;
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = _ ("Verifying authorization…");
-#line 447 "/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 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = self->priv->session;
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = pin;
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6_ = publishing_flickr_access_token_fetch_transaction_new (_tmp4_, _tmp5_);
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	txn = _tmp6_;
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_flickr_flickr_publisher_on_access_token_fetch_txn_completed_publishing_rest_support_transaction_completed, self, 0);
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_flickr_flickr_publisher_on_access_token_fetch_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 3189 "FlickrPublishing.c"
-	{
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3197 "FlickrPublishing.c"
-				goto __catch19_spit_publishing_publishing_error;
-			}
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_publishing_rest_support_transaction_unref0 (txn);
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			g_clear_error (&_inner_error_);
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			return;
-#line 3208 "FlickrPublishing.c"
-		}
-	}
-	goto __finally19;
-	__catch19_spit_publishing_publishing_error:
-	{
-		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp7_ = NULL;
-		GError* _tmp8_ = NULL;
-#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		err = _inner_error_;
-#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_inner_error_ = NULL;
-#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp7_ = self->priv->host;
-#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp8_ = err;
-#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_error_free0 (err);
-#line 3229 "FlickrPublishing.c"
-	}
-	__finally19:
-#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_publishing_rest_support_transaction_unref0 (txn);
-#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_clear_error (&_inner_error_);
-#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		return;
-#line 3242 "FlickrPublishing.c"
-	}
-#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_publishing_rest_support_transaction_unref0 (txn);
-#line 3246 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_flickr_publisher_do_extract_access_phase_credentials_from_reponse (PublishingFlickrFlickrPublisher* self, const gchar* response) {
-	const gchar* _tmp0_ = NULL;
-	gchar* token = NULL;
-	gchar* token_secret = NULL;
-	gchar* username = NULL;
-	GHashTable* data = NULL;
-	const gchar* _tmp1_ = NULL;
-	GHashTable* _tmp2_ = NULL;
-	GHashTable* _tmp3_ = NULL;
-	gconstpointer _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	GHashTable* _tmp6_ = NULL;
-	gconstpointer _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	GHashTable* _tmp9_ = NULL;
-	gconstpointer _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	const gchar* _tmp14_ = NULL;
-	gboolean _tmp15_ = FALSE;
-	gboolean _tmp16_ = FALSE;
-	const gchar* _tmp17_ = NULL;
-	PublishingFlickrSession* _tmp23_ = NULL;
-	const gchar* _tmp24_ = NULL;
-	const gchar* _tmp25_ = NULL;
-	const gchar* _tmp26_ = NULL;
-#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (response != NULL);
-#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = response;
-#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:461: ACTION: extracting access phase credentials" \
-" from '%s'", _tmp0_);
-#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	token = NULL;
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	token_secret = NULL;
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	username = NULL;
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = response;
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = soup_form_decode (_tmp1_);
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	data = _tmp2_;
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = data;
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_hash_table_lookup_extended (_tmp3_, "oauth_token", NULL, &_tmp4_);
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (token);
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = g_strdup (_tmp4_);
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	token = _tmp5_;
-#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6_ = data;
-#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_hash_table_lookup_extended (_tmp6_, "oauth_token_secret", NULL, &_tmp7_);
-#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (token_secret);
-#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp8_ = g_strdup (_tmp7_);
-#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	token_secret = _tmp8_;
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp9_ = data;
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_hash_table_lookup_extended (_tmp9_, "username", NULL, &_tmp10_);
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (username);
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp11_ = g_strdup (_tmp10_);
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	username = _tmp11_;
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp12_ = token;
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp13_ = token_secret;
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp14_ = username;
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:472: access phase credentials: { token = '%s'; t" \
-"oken_secret = '%s'; username = '%s' }", _tmp12_, _tmp13_, _tmp14_);
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp17_ = token;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp17_ == NULL) {
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp16_ = TRUE;
-#line 3341 "FlickrPublishing.c"
-	} else {
-		const gchar* _tmp18_ = NULL;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp18_ = token_secret;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp16_ = _tmp18_ == NULL;
-#line 3348 "FlickrPublishing.c"
-	}
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp16_) {
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp15_ = TRUE;
-#line 3354 "FlickrPublishing.c"
-	} else {
-		const gchar* _tmp19_ = NULL;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp19_ = username;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp15_ = _tmp19_ == NULL;
-#line 3361 "FlickrPublishing.c"
-	}
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp15_) {
-#line 3365 "FlickrPublishing.c"
-		SpitPublishingPluginHost* _tmp20_ = NULL;
-		GError* _tmp21_ = NULL;
-		GError* _tmp22_ = NULL;
-#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp20_ = self->priv->host;
-#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp21_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "expected " "access phase credentials to contain token, token secret, and username " \
-"but at " "least one of these is absent");
-#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp22_ = _tmp21_;
-#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp20_, _tmp22_);
-#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_error_free0 (_tmp22_);
-#line 3379 "FlickrPublishing.c"
-	}
-#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp23_ = self->priv->session;
-#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp24_ = token;
-#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp25_ = token_secret;
-#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp26_ = username;
-#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_session_set_access_phase_credentials (_tmp23_, _tmp24_, _tmp25_, _tmp26_);
-#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_hash_table_unref0 (data);
-#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (username);
-#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (token_secret);
-#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (token);
-#line 3399 "FlickrPublishing.c"
+#line 2185 "FlickrPublishing.c"
 }
 
 
@@ -3435,87 +2201,87 @@ static void publishing_flickr_flickr_publisher_do_fetch_account_info (Publishing
 	PublishingFlickrSession* _tmp2_ = NULL;
 	PublishingFlickrAccountInfoFetchTransaction* _tmp3_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:484: ACTION: running network transaction to fetc" \
+#line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:253: ACTION: running network transaction to fetc" \
 "h account information");
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
-#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->host;
-#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_install_account_fetch_wait_pane (_tmp1_);
-#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = self->priv->session;
-#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = publishing_flickr_account_info_fetch_transaction_new (_tmp2_);
-#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	txn = _tmp3_;
-#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_flickr_flickr_publisher_on_account_fetch_txn_completed_publishing_rest_support_transaction_completed, self, 0);
-#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_flickr_flickr_publisher_on_account_fetch_txn_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 3432 "FlickrPublishing.c"
+#line 2218 "FlickrPublishing.c"
 	{
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3440 "FlickrPublishing.c"
-				goto __catch20_spit_publishing_publishing_error;
+#line 2226 "FlickrPublishing.c"
+				goto __catch13_spit_publishing_publishing_error;
 			}
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (txn);
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 3451 "FlickrPublishing.c"
+#line 2237 "FlickrPublishing.c"
 		}
 	}
-	goto __finally20;
-	__catch20_spit_publishing_publishing_error:
+	goto __finally13;
+	__catch13_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp4_ = NULL;
 		GError* _tmp5_ = NULL;
-#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		err = _inner_error_;
-#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_inner_error_ = NULL;
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp4_ = self->priv->host;
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp5_ = err;
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
-#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (err);
-#line 3472 "FlickrPublishing.c"
+#line 2258 "FlickrPublishing.c"
 	}
-	__finally20:
-#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	__finally13:
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_publishing_rest_support_transaction_unref0 (txn);
-#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 3485 "FlickrPublishing.c"
+#line 2271 "FlickrPublishing.c"
 	}
-#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (txn);
-#line 3489 "FlickrPublishing.c"
+#line 2275 "FlickrPublishing.c"
 }
 
 
@@ -3533,23 +2299,23 @@ static gint64 int64_parse (const gchar* str) {
 	result = _tmp1_;
 #line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 3507 "FlickrPublishing.c"
+#line 2293 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (PublishingFlickrFlickrPublisher* self, const gchar* xml) {
 	const gchar* _tmp0_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (xml != NULL);
-#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = xml;
-#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:501: ACTION: parsing account information from xm" \
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:270: ACTION: parsing account information from xm" \
 "l = '%s'", _tmp0_);
-#line 3522 "FlickrPublishing.c"
+#line 2308 "FlickrPublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* response_doc = NULL;
 		const gchar* _tmp1_ = NULL;
@@ -3582,293 +2348,302 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P
 		gint64 _tmp23_ = 0LL;
 		PublishingFlickrPublishingParameters* _tmp24_ = NULL;
 		PublishingFlickrUserKind _tmp25_ = 0;
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp1_ = xml;
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp2_ = publishing_flickr_transaction_parse_flickr_response (_tmp1_, &_inner_error_);
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		response_doc = _tmp2_;
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3565 "FlickrPublishing.c"
-				goto __catch21_spit_publishing_publishing_error;
+#line 2351 "FlickrPublishing.c"
+				goto __catch14_spit_publishing_publishing_error;
 			}
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 3574 "FlickrPublishing.c"
+#line 2360 "FlickrPublishing.c"
 		}
-#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp3_ = response_doc;
-#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp4_ = publishing_rest_support_xml_document_get_root_node (_tmp3_);
-#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		root_node = _tmp4_;
-#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp5_ = response_doc;
-#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp6_ = root_node;
-#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp7_ = publishing_rest_support_xml_document_get_named_child (_tmp5_, _tmp6_, "user", &_inner_error_);
-#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		user_node = _tmp7_;
-#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3596 "FlickrPublishing.c"
-				goto __catch21_spit_publishing_publishing_error;
+#line 2382 "FlickrPublishing.c"
+				goto __catch14_spit_publishing_publishing_error;
 			}
-#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 3607 "FlickrPublishing.c"
+#line 2393 "FlickrPublishing.c"
 		}
-#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp8_ = response_doc;
-#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp9_ = user_node;
-#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp10_ = publishing_rest_support_xml_document_get_property_value (_tmp8_, _tmp9_, "ispro", &_inner_error_);
-#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		is_pro_str = _tmp10_;
-#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3623 "FlickrPublishing.c"
-				goto __catch21_spit_publishing_publishing_error;
+#line 2409 "FlickrPublishing.c"
+				goto __catch14_spit_publishing_publishing_error;
 			}
-#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 3634 "FlickrPublishing.c"
+#line 2420 "FlickrPublishing.c"
 		}
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp11_ = response_doc;
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp12_ = user_node;
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp13_ = publishing_rest_support_xml_document_get_named_child (_tmp11_, _tmp12_, "bandwidth", &_inner_error_);
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		bandwidth_node = _tmp13_;
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (is_pro_str);
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3652 "FlickrPublishing.c"
-				goto __catch21_spit_publishing_publishing_error;
+#line 2438 "FlickrPublishing.c"
+				goto __catch14_spit_publishing_publishing_error;
 			}
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (is_pro_str);
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 3665 "FlickrPublishing.c"
+#line 2451 "FlickrPublishing.c"
 		}
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp14_ = response_doc;
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp15_ = bandwidth_node;
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp16_ = publishing_rest_support_xml_document_get_property_value (_tmp14_, _tmp15_, "remainingkb", &_inner_error_);
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		remaining_kb_str = _tmp16_;
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (is_pro_str);
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3683 "FlickrPublishing.c"
-				goto __catch21_spit_publishing_publishing_error;
+#line 2469 "FlickrPublishing.c"
+				goto __catch14_spit_publishing_publishing_error;
 			}
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (is_pro_str);
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 3696 "FlickrPublishing.c"
+#line 2482 "FlickrPublishing.c"
 		}
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp17_ = is_pro_str;
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (g_strcmp0 (_tmp17_, "0") == 0) {
-#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			user_kind = PUBLISHING_FLICKR_USER_KIND_FREE;
-#line 3704 "FlickrPublishing.c"
+#line 2490 "FlickrPublishing.c"
 		} else {
 			const gchar* _tmp18_ = NULL;
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp18_ = is_pro_str;
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (g_strcmp0 (_tmp18_, "1") == 0) {
-#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				user_kind = PUBLISHING_FLICKR_USER_KIND_PRO;
-#line 3713 "FlickrPublishing.c"
+#line 2499 "FlickrPublishing.c"
 			} else {
 				GError* _tmp19_ = NULL;
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp19_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to determine if user has free or pro account");
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_inner_error_ = _tmp19_;
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (remaining_kb_str);
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (is_pro_str);
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3728 "FlickrPublishing.c"
-					goto __catch21_spit_publishing_publishing_error;
+#line 2514 "FlickrPublishing.c"
+					goto __catch14_spit_publishing_publishing_error;
 				}
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (remaining_kb_str);
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (is_pro_str);
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				g_clear_error (&_inner_error_);
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				return;
-#line 3743 "FlickrPublishing.c"
+#line 2529 "FlickrPublishing.c"
 			}
 		}
-#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp20_ = remaining_kb_str;
-#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp21_ = int64_parse (_tmp20_);
-#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		quota_bytes_left = _tmp21_ * 1024;
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp22_ = self->priv->parameters;
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp23_ = quota_bytes_left;
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp22_->quota_free_bytes = _tmp23_;
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp24_ = self->priv->parameters;
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp25_ = user_kind;
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp24_->user_kind = _tmp25_;
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (remaining_kb_str);
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (is_pro_str);
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 3770 "FlickrPublishing.c"
+#line 2556 "FlickrPublishing.c"
 	}
-	goto __finally21;
-	__catch21_spit_publishing_publishing_error:
+	goto __finally14;
+	__catch14_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		GError* _tmp26_ = NULL;
 		SpitPublishingPluginHost* _tmp27_ = NULL;
 		GError* _tmp28_ = NULL;
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		err = _inner_error_;
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_inner_error_ = NULL;
-#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp26_ = err;
-#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (g_error_matches (_tmp26_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_EXPIRED_SESSION)) {
-#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			publishing_flickr_flickr_publisher_do_logout (self);
-#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_error_free0 (err);
-#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 3793 "FlickrPublishing.c"
+#line 2579 "FlickrPublishing.c"
 		}
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp27_ = self->priv->host;
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp28_ = err;
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp27_, _tmp28_);
-#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (err);
-#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 3805 "FlickrPublishing.c"
+#line 2591 "FlickrPublishing.c"
 	}
-	__finally21:
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	__finally14:
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 3816 "FlickrPublishing.c"
+#line 2602 "FlickrPublishing.c"
 	}
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_account_info_available (self);
-#line 3820 "FlickrPublishing.c"
+#line 2606 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_do_logout (PublishingFlickrFlickrPublisher* self) {
-	PublishingFlickrSession* _tmp0_ = NULL;
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	SpitPublishingAuthenticator* _tmp0_ = NULL;
+	gboolean _tmp1_ = FALSE;
+#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:545: ACTION: logging user out, deauthenticating " \
+#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:314: ACTION: logging user out, deauthenticating " \
 "session, and erasing stored credentials");
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->session;
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_session_deauthenticate (_tmp0_);
-#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_invalidate_persistent_session (self);
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp0_ = self->priv->authenticator;
+#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp1_ = spit_publishing_authenticator_can_logout (_tmp0_);
+#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (_tmp1_) {
+#line 2623 "FlickrPublishing.c"
+		SpitPublishingAuthenticator* _tmp2_ = NULL;
+#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp2_ = self->priv->authenticator;
+#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		spit_publishing_authenticator_logout (_tmp2_);
+#line 2629 "FlickrPublishing.c"
+	}
+#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->running = FALSE;
-#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_attempt_start (self);
-#line 3840 "FlickrPublishing.c"
+#line 2635 "FlickrPublishing.c"
 }
 
 
@@ -3887,33 +2662,33 @@ static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane (
 	SpitPublishingPluginHost* _tmp17_ = NULL;
 	PublishingFlickrPublishingOptionsPane* _tmp18_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:556: ACTION: displaying publishing options pane");
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:326: ACTION: displaying publishing options pane");
+#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
-#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = gtk_builder_new ();
-#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	builder = _tmp1_;
-#line 3871 "FlickrPublishing.c"
+#line 2666 "FlickrPublishing.c"
 	{
 		GtkBuilder* _tmp2_ = NULL;
-#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp2_ = builder;
-#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		gtk_builder_add_from_resource (_tmp2_, PLUGIN_RESOURCE_PATH "/" "flickr_publishing_options_pane.ui", &_inner_error_);
-#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3880 "FlickrPublishing.c"
-			goto __catch22_g_error;
+#line 2675 "FlickrPublishing.c"
+			goto __catch15_g_error;
 		}
 	}
-	goto __finally22;
-	__catch22_g_error:
+	goto __finally15;
+	__catch15_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp3_ = NULL;
@@ -3922,83 +2697,83 @@ static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane (
 		const gchar* _tmp6_ = NULL;
 		GError* _tmp7_ = NULL;
 		GError* _tmp8_ = NULL;
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		e = _inner_error_;
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_inner_error_ = NULL;
-#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp3_ = e;
-#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp4_ = _tmp3_->message;
-#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_warning ("FlickrPublishing.vala:568: Could not parse UI file! Error: %s.", _tmp4_);
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		g_warning ("FlickrPublishing.vala:338: Could not parse UI file! Error: %s.", _tmp4_);
+#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp5_ = self->priv->host;
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp6_ = _ ("A file required for publishing is unavailable. Publishing to Flickr ca" \
 "n’t continue.");
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 339 "/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 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp8_ = _tmp7_;
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp5_, _tmp8_);
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (_tmp8_);
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (e);
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_object_unref0 (builder);
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 3922 "FlickrPublishing.c"
+#line 2717 "FlickrPublishing.c"
 	}
-	__finally22:
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	__finally15:
+#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_object_unref0 (builder);
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 3935 "FlickrPublishing.c"
+#line 2730 "FlickrPublishing.c"
 	}
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = self->priv->parameters;
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = self->priv->host;
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp11_ = spit_publishing_plugin_host_get_publishable_media_type (_tmp10_);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp12_ = builder;
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp13_ = publishing_flickr_flickr_publisher_get_persistent_strip_metadata (self);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14_ = publishing_flickr_publishing_options_pane_new (self, _tmp9_, _tmp11_, _tmp12_, _tmp13_);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->publishing_options_pane);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->publishing_options_pane = _tmp14_;
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp15_ = self->priv->publishing_options_pane;
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_connect_object (_tmp15_, "publish", (GCallback) _publishing_flickr_flickr_publisher_on_publishing_options_pane_publish_publishing_flickr_publishing_options_pane_publish, self, 0);
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp16_ = self->priv->publishing_options_pane;
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_connect_object (_tmp16_, "logout", (GCallback) _publishing_flickr_flickr_publisher_on_publishing_options_pane_logout_publishing_flickr_publishing_options_pane_logout, self, 0);
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp17_ = self->priv->host;
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp18_ = self->priv->publishing_options_pane;
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_install_dialog_pane (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (builder);
-#line 3969 "FlickrPublishing.c"
+#line 2764 "FlickrPublishing.c"
 }
 
 
@@ -4012,51 +2787,51 @@ gint publishing_flickr_flickr_publisher_flickr_date_time_compare_func (SpitPubli
 	GDateTime* _tmp5_ = NULL;
 	gint _tmp6_ = 0;
 	gint _tmp7_ = 0;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (a), 0);
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (b), 0);
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = a;
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = spit_publishing_publishable_get_exposure_date_time (_tmp0_);
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = _tmp1_;
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = b;
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = spit_publishing_publishable_get_exposure_date_time (_tmp3_);
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = _tmp4_;
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = g_date_time_compare (_tmp2_, _tmp5_);
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = _tmp6_;
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_date_time_unref0 (_tmp5_);
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_date_time_unref0 (_tmp2_);
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp7_;
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 4011 "FlickrPublishing.c"
+#line 2806 "FlickrPublishing.c"
 }
 
 
 static gint _publishing_flickr_flickr_publisher_flickr_date_time_compare_func_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
 	gint result;
 	result = publishing_flickr_flickr_publisher_flickr_date_time_compare_func ((SpitPublishingPublishable*) a, (SpitPublishingPublishable*) b);
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 4020 "FlickrPublishing.c"
+#line 2815 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_flickr_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_upload_status_updated ((PublishingFlickrFlickrPublisher*) self, file_number, fraction_complete);
-#line 4027 "FlickrPublishing.c"
+#line 2822 "FlickrPublishing.c"
 }
 
 
@@ -4096,168 +2871,168 @@ static void publishing_flickr_flickr_publisher_do_publish (PublishingFlickrFlick
 	PublishingFlickrUploader* _tmp28_ = NULL;
 	PublishingFlickrUploader* _tmp29_ = NULL;
 	PublishingFlickrUploader* _tmp30_ = NULL;
-#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = strip_metadata;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_set_persistent_strip_metadata (self, _tmp0_);
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:589: ACTION: uploading media items to remote ser" \
+#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:359: ACTION: uploading media items to remote ser" \
 "ver.");
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->host;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp1_, TRUE);
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = self->priv->host;
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = self->priv->parameters;
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = _tmp3_->photo_major_axis_size;
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = strip_metadata;
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = spit_publishing_plugin_host_serialize_publishables (_tmp2_, _tmp4_, _tmp5_, &_tmp6_, &_tmp7_);
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter = NULL;
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter_target = NULL;
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter = _tmp8_;
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter_target = _tmp6_;
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = _tmp7_;
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!_tmp9_) {
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 4109 "FlickrPublishing.c"
+#line 2904 "FlickrPublishing.c"
 	}
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = self->priv->host;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp12_ = spit_publishing_plugin_host_get_publishables (_tmp10_, &_tmp11_);
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishables = _tmp12_;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishables_length1 = _tmp11_;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishables_size_ = publishables_length1;
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp13_ = gee_array_list_new (SPIT_PUBLISHING_TYPE_PUBLISHABLE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	sorted_list = _tmp13_;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14_ = publishables;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14__length1 = publishables_length1;
-#line 4129 "FlickrPublishing.c"
+#line 2924 "FlickrPublishing.c"
 	{
 		SpitPublishingPublishable** p_collection = NULL;
 		gint p_collection_length1 = 0;
 		gint _p_collection_size_ = 0;
 		gint p_it = 0;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		p_collection = _tmp14_;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		p_collection_length1 = _tmp14__length1;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		for (p_it = 0; p_it < _tmp14__length1; p_it = p_it + 1) {
-#line 4141 "FlickrPublishing.c"
+#line 2936 "FlickrPublishing.c"
 			SpitPublishingPublishable* _tmp15_ = NULL;
 			SpitPublishingPublishable* p = NULL;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp15_ = _g_object_ref0 (p_collection[p_it]);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			p = _tmp15_;
-#line 4148 "FlickrPublishing.c"
+#line 2943 "FlickrPublishing.c"
 			{
 				GeeArrayList* _tmp16_ = NULL;
 				SpitPublishingPublishable* _tmp17_ = NULL;
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp16_ = sorted_list;
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp17_ = p;
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_object_unref0 (p);
-#line 4160 "FlickrPublishing.c"
+#line 2955 "FlickrPublishing.c"
 			}
 		}
 	}
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp18_ = sorted_list;
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	gee_list_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_LIST, GeeList), _publishing_flickr_flickr_publisher_flickr_date_time_compare_func_gcompare_data_func, NULL, NULL);
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp19_ = self->priv->session;
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp20_ = sorted_list;
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp22_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection), &_tmp21_);
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp23_ = _tmp22_;
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp23__length1 = _tmp21_;
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp24_ = self->priv->parameters;
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp25_ = strip_metadata;
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp26_ = publishing_flickr_uploader_new (_tmp19_, _tmp23_, _tmp21_, _tmp24_, _tmp25_);
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp27_ = _tmp26_;
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp23_ = (_vala_array_free (_tmp23_, _tmp23__length1, (GDestroyNotify) g_object_unref), NULL);
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	uploader = _tmp27_;
-#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp28_ = uploader;
-#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-complete", (GCallback) _publishing_flickr_flickr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self, 0);
-#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp29_ = uploader;
-#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-error", (GCallback) _publishing_flickr_flickr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self, 0);
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp30_ = uploader;
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_rest_support_batch_uploader_upload (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), _publishing_flickr_flickr_publisher_on_upload_status_updated_spit_publishing_progress_callback, self);
-#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_rest_support_batch_uploader_unref0 (uploader);
-#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (sorted_list);
-#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 4208 "FlickrPublishing.c"
+#line 3003 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_do_show_success_pane (PublishingFlickrFlickrPublisher* self) {
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	SpitPublishingPluginHost* _tmp1_ = NULL;
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:617: ACTION: showing success pane.");
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:387: ACTION: showing success pane.");
+#line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->host;
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_install_success_pane (_tmp1_);
-#line 4227 "FlickrPublishing.c"
+#line 3022 "FlickrPublishing.c"
 }
 
 
@@ -4265,32 +3040,32 @@ gint publishing_flickr_flickr_publisher_get_persistent_visibility (PublishingFli
 	gint result = 0;
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), 0);
-#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "visibility", 0);
-#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp1_;
-#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 4245 "FlickrPublishing.c"
+#line 3040 "FlickrPublishing.c"
 }
 
 
 void publishing_flickr_flickr_publisher_set_persistent_visibility (PublishingFlickrFlickrPublisher* self, gint vis) {
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = vis;
-#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "visibility", _tmp1_);
-#line 4260 "FlickrPublishing.c"
+#line 3055 "FlickrPublishing.c"
 }
 
 
@@ -4298,32 +3073,32 @@ gint publishing_flickr_flickr_publisher_get_persistent_default_size (PublishingF
 	gint result = 0;
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), 0);
-#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_size", 1);
-#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp1_;
-#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 4278 "FlickrPublishing.c"
+#line 3073 "FlickrPublishing.c"
 }
 
 
 void publishing_flickr_flickr_publisher_set_persistent_default_size (PublishingFlickrFlickrPublisher* self, gint size) {
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = size;
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_size", _tmp1_);
-#line 4293 "FlickrPublishing.c"
+#line 3088 "FlickrPublishing.c"
 }
 
 
@@ -4332,17 +3107,17 @@ static SpitPublishingService* publishing_flickr_flickr_publisher_real_get_servic
 	SpitPublishingService* result = NULL;
 	SpitPublishingService* _tmp0_ = NULL;
 	SpitPublishingService* _tmp1_ = NULL;
-#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher);
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->service;
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp1_;
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 4312 "FlickrPublishing.c"
+#line 3107 "FlickrPublishing.c"
 }
 
 
@@ -4350,72 +3125,31 @@ static gboolean publishing_flickr_flickr_publisher_real_is_running (SpitPublishi
 	PublishingFlickrFlickrPublisher * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher);
-#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->running;
-#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp0_;
-#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 4328 "FlickrPublishing.c"
+#line 3123 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_attempt_start (PublishingFlickrFlickrPublisher* self) {
-	gboolean _tmp0_ = FALSE;
-#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	SpitPublishingAuthenticator* _tmp0_ = NULL;
+#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->running = TRUE;
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->was_started = TRUE;
-#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = publishing_flickr_flickr_publisher_is_persistent_session_valid (self);
-#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp0_) {
-#line 4344 "FlickrPublishing.c"
-		PublishingFlickrSession* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_debug ("FlickrPublishing.vala:654: attempt start: a persistent session is avai" \
-"lable; using it");
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp1_ = self->priv->session;
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp2_ = publishing_flickr_flickr_publisher_get_persistent_access_phase_token (self);
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp3_ = _tmp2_;
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp4_ = publishing_flickr_flickr_publisher_get_persistent_access_phase_token_secret (self);
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp5_ = _tmp4_;
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp6_ = publishing_flickr_flickr_publisher_get_persistent_access_phase_username (self);
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp7_ = _tmp6_;
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		publishing_flickr_session_authenticate_from_persistent_credentials (_tmp1_, _tmp3_, _tmp5_, _tmp7_);
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_free0 (_tmp7_);
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_free0 (_tmp5_);
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_free0 (_tmp3_);
-#line 4376 "FlickrPublishing.c"
-	} else {
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_debug ("FlickrPublishing.vala:659: attempt start: no persistent session availa" \
-"ble; showing login welcome pane");
-#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		publishing_flickr_flickr_publisher_do_show_login_welcome_pane (self);
-#line 4382 "FlickrPublishing.c"
-	}
+#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp0_ = self->priv->authenticator;
+#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	spit_publishing_authenticator_authenticate (_tmp0_);
+#line 3139 "FlickrPublishing.c"
 }
 
 
@@ -4423,136 +3157,140 @@ static void publishing_flickr_flickr_publisher_real_start (SpitPublishingPublish
 	PublishingFlickrFlickrPublisher * self;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher);
-#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp0_) {
-#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 4399 "FlickrPublishing.c"
+#line 3155 "FlickrPublishing.c"
 	}
-#line 669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->was_started;
-#line 669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp1_) {
-#line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_error ("FlickrPublishing.vala:670: FlickrPublisher: start( ): can't start; thi" \
+#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		g_error ("FlickrPublishing.vala:431: FlickrPublisher: start( ): can't start; thi" \
 "s publisher is not restartable.");
-#line 4407 "FlickrPublishing.c"
+#line 3163 "FlickrPublishing.c"
 	}
-#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:672: FlickrPublisher: starting interaction.");
-#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:433: FlickrPublisher: starting interaction.");
+#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_attempt_start (self);
-#line 4413 "FlickrPublishing.c"
+#line 3169 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_real_stop (SpitPublishingPublisher* base) {
 	PublishingFlickrFlickrPublisher * self;
 	PublishingFlickrSession* _tmp0_ = NULL;
-#line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher);
-#line 678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:678: FlickrPublisher: stop( ) invoked.");
-#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:439: FlickrPublisher: stop( ) invoked.");
+#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->session;
-#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp0_ != NULL) {
-#line 4428 "FlickrPublishing.c"
+#line 3184 "FlickrPublishing.c"
 		PublishingFlickrSession* _tmp1_ = NULL;
-#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp1_ = self->priv->session;
-#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_rest_support_session_stop_transactions (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 4434 "FlickrPublishing.c"
+#line 3190 "FlickrPublishing.c"
 	}
-#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->running = FALSE;
-#line 4438 "FlickrPublishing.c"
+#line 3194 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_class_init (PublishingFlickrFlickrPublisherClass * klass) {
-#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_parent_class = g_type_class_peek_parent (klass);
-#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFlickrFlickrPublisherPrivate));
-#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_flickr_flickr_publisher_finalize;
-#line 4449 "FlickrPublishing.c"
+#line 3205 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface) {
-#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface);
-#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	iface->get_service = (SpitPublishingService* (*)(SpitPublishingPublisher*)) publishing_flickr_flickr_publisher_real_get_service;
-#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	iface->is_running = (gboolean (*)(SpitPublishingPublisher*)) publishing_flickr_flickr_publisher_real_is_running;
-#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	iface->start = (void (*)(SpitPublishingPublisher*)) publishing_flickr_flickr_publisher_real_start;
-#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_flickr_flickr_publisher_real_stop;
-#line 4464 "FlickrPublishing.c"
+#line 3220 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_instance_init (PublishingFlickrFlickrPublisher * self) {
-#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv = PUBLISHING_FLICKR_FLICKR_PUBLISHER_GET_PRIVATE (self);
-#line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter = NULL;
-#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->running = FALSE;
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->was_started = FALSE;
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->session = NULL;
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->publishing_options_pane = NULL;
-#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->authenticator = NULL;
+#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->parameters = NULL;
-#line 4483 "FlickrPublishing.c"
+#line 3241 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_finalize (GObject* obj) {
 	PublishingFlickrFlickrPublisher * self;
-	PublishingFlickrSession* _tmp0_ = NULL;
+	SpitPublishingAuthenticator* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
-#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher);
-#line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->session;
-#line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_parse_name ("authenticated", PUBLISHING_REST_SUPPORT_TYPE_SESSION, &_tmp1_, NULL, FALSE);
-#line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_session_authenticated_publishing_rest_support_session_authenticated, self);
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp0_ = self->priv->authenticator;
+#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_signal_parse_name ("authenticated", SPIT_PUBLISHING_TYPE_AUTHENTICATOR, &_tmp1_, NULL, FALSE);
+#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_session_authenticated_spit_publishing_authenticator_authenticated, self);
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->service);
-#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->host);
-#line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
-#line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter = NULL;
-#line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter_target = NULL;
-#line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->publishing_options_pane);
-#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_object_unref0 (self->priv->authenticator);
+#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
-#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_OBJECT_CLASS (publishing_flickr_flickr_publisher_parent_class)->finalize (obj);
-#line 4519 "FlickrPublishing.c"
+#line 3279 "FlickrPublishing.c"
 }
 
 
@@ -4570,366 +3308,6 @@ GType publishing_flickr_flickr_publisher_get_type (void) {
 }
 
 
-PublishingFlickrPinEntryPane* publishing_flickr_pin_entry_pane_construct (GType object_type, GtkBuilder* builder) {
-	PublishingFlickrPinEntryPane * self = NULL;
-	GtkBuilder* _tmp0_ = NULL;
-	GtkBuilder* _tmp1_ = NULL;
-	GtkBuilder* _tmp2_ = NULL;
-	GtkBuilder* _tmp3_ = NULL;
-	GSList* _tmp4_ = NULL;
-	GSList* _tmp5_ = NULL;
-	guint _tmp6_ = 0U;
-	GtkBuilder* _tmp7_ = NULL;
-	GObject* _tmp8_ = NULL;
-	GtkLabel* _tmp9_ = NULL;
-	GtkBuilder* _tmp10_ = NULL;
-	GObject* _tmp11_ = NULL;
-	GtkLabel* _tmp12_ = NULL;
-	GtkBuilder* _tmp13_ = NULL;
-	GObject* _tmp14_ = NULL;
-	GtkEntry* _tmp15_ = NULL;
-	GtkBuilder* _tmp16_ = NULL;
-	GObject* _tmp17_ = NULL;
-	GtkButton* _tmp18_ = NULL;
-	GtkBuilder* _tmp19_ = NULL;
-	GObject* _tmp20_ = NULL;
-	GtkBox* _tmp21_ = NULL;
-	GtkBox* _tmp22_ = NULL;
-#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (GTK_IS_BUILDER (builder), NULL);
-#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self = (PublishingFlickrPinEntryPane*) g_object_new (object_type, NULL);
-#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = builder;
-#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_object_unref0 (self->priv->builder);
-#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->builder = _tmp1_;
-#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = builder;
-#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_assert (_tmp2_ != NULL, "builder != null");
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = builder;
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = gtk_builder_get_objects (_tmp3_);
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = _tmp4_;
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6_ = g_slist_length (_tmp5_);
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_assert (_tmp6_ > ((guint) 0), "builder.get_objects().length() > 0");
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_slist_free0 (_tmp5_);
-#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp7_ = builder;
-#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp8_ = gtk_builder_get_object (_tmp7_, "explanatory_text");
-#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp8_) : NULL);
-#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_object_unref0 (self->priv->explanatory_text);
-#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->explanatory_text = _tmp9_;
-#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp10_ = builder;
-#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp11_ = gtk_builder_get_object (_tmp10_, "pin_entry_caption");
-#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp11_) : NULL);
-#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_object_unref0 (self->priv->pin_entry_caption);
-#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->pin_entry_caption = _tmp12_;
-#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp13_ = builder;
-#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp14_ = gtk_builder_get_object (_tmp13_, "pin_entry");
-#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp14_) : NULL);
-#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_object_unref0 (self->priv->pin_entry);
-#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->pin_entry = _tmp15_;
-#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp16_ = builder;
-#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp17_ = gtk_builder_get_object (_tmp16_, "continue_button");
-#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, gtk_button_get_type ()) ? ((GtkButton*) _tmp17_) : NULL);
-#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_object_unref0 (self->priv->continue_button);
-#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->continue_button = _tmp18_;
-#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp19_ = builder;
-#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp20_ = gtk_builder_get_object (_tmp19_, "pane_widget");
-#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, gtk_box_get_type ()) ? ((GtkBox*) _tmp20_) : NULL);
-#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_object_unref0 (self->priv->pane_widget);
-#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->pane_widget = _tmp21_;
-#line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp22_ = self->priv->pane_widget;
-#line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget));
-#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_pin_entry_pane_on_pin_entry_contents_changed (self);
-#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return self;
-#line 4648 "FlickrPublishing.c"
-}
-
-
-PublishingFlickrPinEntryPane* publishing_flickr_pin_entry_pane_new (GtkBuilder* builder) {
-#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return publishing_flickr_pin_entry_pane_construct (PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, builder);
-#line 4655 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_pin_entry_pane_on_continue_clicked (PublishingFlickrPinEntryPane* self) {
-	GtkEntry* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_PIN_ENTRY_PANE (self));
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->pin_entry;
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = gtk_entry_get_text (_tmp0_);
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_emit_by_name (self, "proceed", self, _tmp1_);
-#line 4670 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_pin_entry_pane_on_pin_entry_contents_changed (PublishingFlickrPinEntryPane* self) {
-	GtkButton* _tmp0_ = NULL;
-	GtkEntry* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
-	guint _tmp3_ = 0U;
-#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_PIN_ENTRY_PANE (self));
-#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->continue_button;
-#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = self->priv->pin_entry;
-#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = gtk_entry_get_text_length (_tmp1_);
-#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = _tmp2_;
-#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _tmp3_ > ((guint) 0));
-#line 4691 "FlickrPublishing.c"
-}
-
-
-static GtkWidget* publishing_flickr_pin_entry_pane_real_get_widget (SpitPublishingDialogPane* base) {
-	PublishingFlickrPinEntryPane * self;
-	GtkWidget* result = NULL;
-	GtkBox* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
-#line 722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingFlickrPinEntryPane);
-#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->pane_widget;
-#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	result = _tmp1_;
-#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return result;
-#line 4710 "FlickrPublishing.c"
-}
-
-
-static SpitPublishingDialogPaneGeometryOptions publishing_flickr_pin_entry_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
-	PublishingFlickrPinEntryPane * self;
-	SpitPublishingDialogPaneGeometryOptions result = 0;
-#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingFlickrPinEntryPane);
-#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return result;
-#line 4723 "FlickrPublishing.c"
-}
-
-
-static void _publishing_flickr_pin_entry_pane_on_continue_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_pin_entry_pane_on_continue_clicked ((PublishingFlickrPinEntryPane*) self);
-#line 4730 "FlickrPublishing.c"
-}
-
-
-static void _publishing_flickr_pin_entry_pane_on_pin_entry_contents_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_pin_entry_pane_on_pin_entry_contents_changed ((PublishingFlickrPinEntryPane*) self);
-#line 4737 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_pin_entry_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
-	PublishingFlickrPinEntryPane * self;
-	GtkButton* _tmp0_ = NULL;
-	GtkEntry* _tmp1_ = NULL;
-#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingFlickrPinEntryPane);
-#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->continue_button;
-#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_connect_object (_tmp0_, "clicked", (GCallback) _publishing_flickr_pin_entry_pane_on_continue_clicked_gtk_button_clicked, self, 0);
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = self->priv->pin_entry;
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_flickr_pin_entry_pane_on_pin_entry_contents_changed_gtk_editable_changed, self, 0);
-#line 4755 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_pin_entry_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
-	PublishingFlickrPinEntryPane * self;
-	GtkButton* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	GtkEntry* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingFlickrPinEntryPane);
-#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->continue_button;
-#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp1_, NULL, FALSE);
-#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_flickr_pin_entry_pane_on_continue_clicked_gtk_button_clicked, self);
-#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = self->priv->pin_entry;
-#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_parse_name ("changed", GTK_TYPE_EDITABLE, &_tmp3_, NULL, FALSE);
-#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GTK_TYPE_EDITABLE, GtkEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_flickr_pin_entry_pane_on_pin_entry_contents_changed_gtk_editable_changed, self);
-#line 4779 "FlickrPublishing.c"
-}
-
-
-static void g_cclosure_user_marshal_VOID__OBJECT_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
-	typedef void (*GMarshalFunc_VOID__OBJECT_STRING) (gpointer data1, gpointer arg_1, const char* arg_2, gpointer data2);
-	register GMarshalFunc_VOID__OBJECT_STRING callback;
-	register GCClosure * cc;
-	register gpointer data1;
-	register gpointer data2;
-	cc = (GCClosure *) closure;
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (n_param_values == 3);
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		data1 = closure->data;
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		data2 = param_values->data[0].v_pointer;
-#line 4798 "FlickrPublishing.c"
-	} else {
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		data1 = param_values->data[0].v_pointer;
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		data2 = closure->data;
-#line 4804 "FlickrPublishing.c"
-	}
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	callback = (GMarshalFunc_VOID__OBJECT_STRING) (marshal_data ? marshal_data : cc->callback);
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	callback (data1, g_value_get_object (param_values + 1), g_value_get_string (param_values + 2), data2);
-#line 4810 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_pin_entry_pane_class_init (PublishingFlickrPinEntryPaneClass * klass) {
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_pin_entry_pane_parent_class = g_type_class_peek_parent (klass);
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_type_class_add_private (klass, sizeof (PublishingFlickrPinEntryPanePrivate));
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	G_OBJECT_CLASS (klass)->finalize = publishing_flickr_pin_entry_pane_finalize;
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_new ("proceed", PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_STRING, G_TYPE_NONE, 2, PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, G_TYPE_STRING);
-#line 4823 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_pin_entry_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_pin_entry_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_flickr_pin_entry_pane_real_get_widget;
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_flickr_pin_entry_pane_real_get_preferred_geometry;
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_flickr_pin_entry_pane_real_on_pane_installed;
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_flickr_pin_entry_pane_real_on_pane_uninstalled;
-#line 4838 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_pin_entry_pane_instance_init (PublishingFlickrPinEntryPane * self) {
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv = PUBLISHING_FLICKR_PIN_ENTRY_PANE_GET_PRIVATE (self);
-#line 688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->pane_widget = NULL;
-#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->continue_button = NULL;
-#line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->pin_entry = NULL;
-#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->pin_entry_caption = NULL;
-#line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->explanatory_text = NULL;
-#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->builder = NULL;
-#line 4857 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_pin_entry_pane_finalize (GObject* obj) {
-	PublishingFlickrPinEntryPane * self;
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingFlickrPinEntryPane);
-#line 688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_object_unref0 (self->priv->pane_widget);
-#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_object_unref0 (self->priv->continue_button);
-#line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_object_unref0 (self->priv->pin_entry);
-#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_object_unref0 (self->priv->pin_entry_caption);
-#line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_object_unref0 (self->priv->explanatory_text);
-#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_object_unref0 (self->priv->builder);
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	G_OBJECT_CLASS (publishing_flickr_pin_entry_pane_parent_class)->finalize (obj);
-#line 4879 "FlickrPublishing.c"
-}
-
-
-GType publishing_flickr_pin_entry_pane_get_type (void) {
-	static volatile gsize publishing_flickr_pin_entry_pane_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_flickr_pin_entry_pane_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (PublishingFlickrPinEntryPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_flickr_pin_entry_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFlickrPinEntryPane), 0, (GInstanceInitFunc) publishing_flickr_pin_entry_pane_instance_init, NULL };
-		static const GInterfaceInfo spit_publishing_dialog_pane_info = { (GInterfaceInitFunc) publishing_flickr_pin_entry_pane_spit_publishing_dialog_pane_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
-		GType publishing_flickr_pin_entry_pane_type_id;
-		publishing_flickr_pin_entry_pane_type_id = g_type_register_static (G_TYPE_OBJECT, "PublishingFlickrPinEntryPane", &g_define_type_info, 0);
-		g_type_add_interface_static (publishing_flickr_pin_entry_pane_type_id, SPIT_PUBLISHING_TYPE_DIALOG_PANE, &spit_publishing_dialog_pane_info);
-		g_once_init_leave (&publishing_flickr_pin_entry_pane_type_id__volatile, publishing_flickr_pin_entry_pane_type_id);
-	}
-	return publishing_flickr_pin_entry_pane_type_id__volatile;
-}
-
-
 PublishingFlickrTransaction* publishing_flickr_transaction_construct (GType object_type, PublishingFlickrSession* session, PublishingRESTSupportHttpMethod method) {
 	PublishingFlickrTransaction* self = NULL;
 	PublishingFlickrSession* _tmp0_ = NULL;
@@ -4940,52 +3318,63 @@ PublishingFlickrTransaction* publishing_flickr_transaction_construct (GType obje
 	PublishingFlickrSession* _tmp5_ = NULL;
 	gchar* _tmp6_ = NULL;
 	gchar* _tmp7_ = NULL;
-#line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	PublishingFlickrSession* _tmp8_ = NULL;
+	gchar* _tmp9_ = NULL;
+	gchar* _tmp10_ = NULL;
+#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL);
-#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = session;
-#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = method;
-#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrTransaction*) publishing_rest_support_transaction_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_);
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = session;
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = publishing_flickr_session_get_oauth_nonce (_tmp2_);
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = _tmp3_;
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_nonce", _tmp4_);
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp4_);
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_signature_method", "HMAC-SHA1");
-#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_version", "1.0");
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_callback", "oob");
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = session;
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = publishing_flickr_session_get_oauth_timestamp (_tmp5_);
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = _tmp6_;
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_timestamp", _tmp7_);
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp7_);
-#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_consumer_key", PUBLISHING_FLICKR_API_KEY);
-#line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp8_ = session;
+#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp9_ = publishing_flickr_session_get_consumer_key (_tmp8_);
+#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp10_ = _tmp9_;
+#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_consumer_key", _tmp10_);
+#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_free0 (_tmp10_);
+#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 4945 "FlickrPublishing.c"
+#line 3356 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrTransaction* publishing_flickr_transaction_new (PublishingFlickrSession* session, PublishingRESTSupportHttpMethod method) {
-#line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_transaction_construct (PUBLISHING_FLICKR_TYPE_TRANSACTION, session, method);
-#line 4952 "FlickrPublishing.c"
+#line 3363 "FlickrPublishing.c"
 }
 
 
@@ -5000,56 +3389,67 @@ PublishingFlickrTransaction* publishing_flickr_transaction_construct_with_uri (G
 	PublishingFlickrSession* _tmp6_ = NULL;
 	gchar* _tmp7_ = NULL;
 	gchar* _tmp8_ = NULL;
-#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	PublishingFlickrSession* _tmp9_ = NULL;
+	gchar* _tmp10_ = NULL;
+	gchar* _tmp11_ = NULL;
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL);
-#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (uri != NULL, NULL);
-#line 756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = session;
-#line 756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = uri;
-#line 756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = method;
-#line 756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrTransaction*) 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 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = session;
-#line 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = publishing_flickr_session_get_oauth_nonce (_tmp3_);
-#line 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = _tmp4_;
-#line 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_nonce", _tmp5_);
-#line 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp5_);
-#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 466 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_signature_method", "HMAC-SHA1");
-#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_version", "1.0");
-#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_callback", "oob");
-#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = session;
-#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = publishing_flickr_session_get_oauth_timestamp (_tmp6_);
-#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = _tmp7_;
-#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_timestamp", _tmp8_);
-#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp8_);
-#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_consumer_key", PUBLISHING_FLICKR_API_KEY);
-#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp9_ = session;
+#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp10_ = publishing_flickr_session_get_consumer_key (_tmp9_);
+#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp11_ = _tmp10_;
+#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_consumer_key", _tmp11_);
+#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_free0 (_tmp11_);
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 5009 "FlickrPublishing.c"
+#line 3431 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrTransaction* publishing_flickr_transaction_new_with_uri (PublishingFlickrSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method) {
-#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_transaction_construct_with_uri (PUBLISHING_FLICKR_TYPE_TRANSACTION, session, uri, method);
-#line 5016 "FlickrPublishing.c"
+#line 3438 "FlickrPublishing.c"
 }
 
 
@@ -5058,35 +3458,35 @@ static void publishing_flickr_transaction_real_execute (PublishingRESTSupportTra
 	PublishingRESTSupportSession* _tmp0_ = NULL;
 	PublishingFlickrSession* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_TRANSACTION, PublishingFlickrTransaction);
-#line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = publishing_rest_support_transaction_get_parent_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSession);
-#line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_session_sign_transaction (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_rest_support_session_unref0 (_tmp1_);
-#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_flickr_transaction_parent_class)->execute (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_propagate_error (error, _inner_error_);
-#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 5045 "FlickrPublishing.c"
+#line 3467 "FlickrPublishing.c"
 		} else {
-#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 5053 "FlickrPublishing.c"
+#line 3475 "FlickrPublishing.c"
 		}
 	}
 }
@@ -5112,152 +3512,152 @@ gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocum
 	gchar* _tmp18_ = NULL;
 	gchar* _tmp19_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL);
-#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = doc;
-#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = publishing_rest_support_xml_document_get_root_node (_tmp0_);
-#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	root = _tmp1_;
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = root;
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = (gchar*) xmlGetProp (_tmp2_, (xmlChar*) "stat");
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	status = _tmp3_;
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = status;
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp4_ == NULL) {
-#line 5097 "FlickrPublishing.c"
+#line 3519 "FlickrPublishing.c"
 		gchar* _tmp5_ = NULL;
-#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp5_ = g_strdup ("No status property in root node");
-#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		result = _tmp5_;
-#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (status);
-#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return result;
-#line 5107 "FlickrPublishing.c"
+#line 3529 "FlickrPublishing.c"
 	}
-#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = status;
-#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (g_strcmp0 (_tmp6_, "ok") == 0) {
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		result = NULL;
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (status);
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return result;
-#line 5119 "FlickrPublishing.c"
+#line 3541 "FlickrPublishing.c"
 	}
 	{
 		xmlNode* _tmp7_ = NULL;
 		PublishingRESTSupportXmlDocument* _tmp8_ = NULL;
 		xmlNode* _tmp9_ = NULL;
 		xmlNode* _tmp10_ = NULL;
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp8_ = doc;
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp9_ = root;
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp10_ = publishing_rest_support_xml_document_get_named_child (_tmp8_, _tmp9_, "err", &_inner_error_);
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp7_ = _tmp10_;
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5138 "FlickrPublishing.c"
-				goto __catch23_spit_publishing_publishing_error;
+#line 3560 "FlickrPublishing.c"
+				goto __catch16_spit_publishing_publishing_error;
 			}
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (status);
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return NULL;
-#line 5149 "FlickrPublishing.c"
+#line 3571 "FlickrPublishing.c"
 		}
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		errcode = _tmp7_;
-#line 5153 "FlickrPublishing.c"
+#line 3575 "FlickrPublishing.c"
 	}
-	goto __finally23;
-	__catch23_spit_publishing_publishing_error:
+	goto __finally16;
+	__catch16_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp11_ = NULL;
-#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		err = _inner_error_;
-#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_inner_error_ = NULL;
-#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp11_ = g_strdup ("No error code specified");
-#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		result = _tmp11_;
-#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (err);
-#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (status);
-#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return result;
-#line 5174 "FlickrPublishing.c"
+#line 3596 "FlickrPublishing.c"
 	}
-	__finally23:
-#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	__finally16:
+#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (status);
-#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return NULL;
-#line 5187 "FlickrPublishing.c"
+#line 3609 "FlickrPublishing.c"
 	}
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp12_ = errcode;
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp13_ = (gchar*) xmlGetProp (_tmp12_, (xmlChar*) "msg");
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14_ = _tmp13_;
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp15_ = errcode;
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp16_ = (gchar*) xmlGetProp (_tmp15_, (xmlChar*) "code");
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp17_ = _tmp16_;
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp18_ = g_strdup_printf ("%s (error code %s)", _tmp14_, _tmp17_);
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp19_ = _tmp18_;
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp17_);
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp14_);
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp19_;
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (status);
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 5215 "FlickrPublishing.c"
+#line 3637 "FlickrPublishing.c"
 }
 
 
 static gchar* _publishing_flickr_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self) {
 	gchar* result;
 	result = publishing_flickr_transaction_validate_xml (doc);
-#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 5224 "FlickrPublishing.c"
+#line 3646 "FlickrPublishing.c"
 }
 
 
@@ -5277,14 +3677,14 @@ 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 5244 "FlickrPublishing.c"
+#line 3666 "FlickrPublishing.c"
 }
 
 
 static gpointer _g_error_copy0 (gpointer self) {
-#line 813 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? g_error_copy (self) : NULL;
-#line 5251 "FlickrPublishing.c"
+#line 3673 "FlickrPublishing.c"
 }
 
 
@@ -5292,53 +3692,53 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res
 	PublishingRESTSupportXmlDocument* result = NULL;
 	PublishingRESTSupportXmlDocument* _result_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (xml != NULL, NULL);
-#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_result_ = NULL;
-#line 5263 "FlickrPublishing.c"
+#line 3685 "FlickrPublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* _tmp0_ = NULL;
 		const gchar* _tmp1_ = NULL;
 		PublishingRESTSupportXmlDocument* _tmp2_ = NULL;
 		PublishingRESTSupportXmlDocument* _tmp3_ = NULL;
-#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp1_ = xml;
-#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp2_ = publishing_rest_support_xml_document_parse_string (_tmp1_, _publishing_flickr_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
-#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp0_ = _tmp2_;
-#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5279 "FlickrPublishing.c"
-				goto __catch24_spit_publishing_publishing_error;
+#line 3701 "FlickrPublishing.c"
+				goto __catch17_spit_publishing_publishing_error;
 			}
-#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (_result_);
-#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return NULL;
-#line 5290 "FlickrPublishing.c"
+#line 3712 "FlickrPublishing.c"
 		}
-#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp3_ = _tmp0_;
-#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp0_ = NULL;
-#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (_result_);
-#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_result_ = _tmp3_;
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (_tmp0_);
-#line 5302 "FlickrPublishing.c"
+#line 3724 "FlickrPublishing.c"
 	}
-	goto __finally24;
-	__catch24_spit_publishing_publishing_error:
+	goto __finally17;
+	__catch17_spit_publishing_publishing_error:
 	{
 		GError* e = NULL;
 		GError* _tmp4_ = NULL;
@@ -5347,98 +3747,98 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res
 		gchar* _tmp7_ = NULL;
 		gboolean _tmp8_ = FALSE;
 		gboolean _tmp9_ = FALSE;
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		e = _inner_error_;
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_inner_error_ = NULL;
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp4_ = e;
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp5_ = _tmp4_->message;
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp6_ = g_strdup_printf ("(error code %s)", PUBLISHING_FLICKR_EXPIRED_SESSION_ERROR_CODE);
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp7_ = _tmp6_;
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp8_ = string_contains (_tmp5_, _tmp7_);
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp9_ = _tmp8_;
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp7_);
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (_tmp9_) {
-#line 5334 "FlickrPublishing.c"
+#line 3756 "FlickrPublishing.c"
 			GError* _tmp10_ = NULL;
 			const gchar* _tmp11_ = NULL;
 			GError* _tmp12_ = NULL;
-#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp10_ = e;
-#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp11_ = _tmp10_->message;
-#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp12_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_EXPIRED_SESSION, _tmp11_);
-#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_inner_error_ = _tmp12_;
-#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_error_free0 (e);
-#line 5348 "FlickrPublishing.c"
-			goto __finally24;
+#line 3770 "FlickrPublishing.c"
+			goto __finally17;
 		} else {
 			GError* _tmp13_ = NULL;
 			GError* _tmp14_ = NULL;
-#line 813 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp13_ = e;
-#line 813 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp14_ = _g_error_copy0 (_tmp13_);
-#line 813 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_inner_error_ = _tmp14_;
-#line 813 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_error_free0 (e);
-#line 5361 "FlickrPublishing.c"
-			goto __finally24;
+#line 3783 "FlickrPublishing.c"
+			goto __finally17;
 		}
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (e);
-#line 5366 "FlickrPublishing.c"
+#line 3788 "FlickrPublishing.c"
 	}
-	__finally24:
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	__finally17:
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_propagate_error (error, _inner_error_);
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (_result_);
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return NULL;
-#line 5379 "FlickrPublishing.c"
+#line 3801 "FlickrPublishing.c"
 		} else {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (_result_);
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return NULL;
-#line 5389 "FlickrPublishing.c"
+#line 3811 "FlickrPublishing.c"
 		}
 	}
-#line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _result_;
-#line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 5396 "FlickrPublishing.c"
+#line 3818 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_transaction_class_init (PublishingFlickrTransactionClass * klass) {
-#line 741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_flickr_transaction_real_execute;
-#line 5405 "FlickrPublishing.c"
+#line 3827 "FlickrPublishing.c"
 }
 
 
@@ -5458,157 +3858,47 @@ GType publishing_flickr_transaction_get_type (void) {
 }
 
 
-PublishingFlickrAuthenticationRequestTransaction* publishing_flickr_authentication_request_transaction_construct (GType object_type, PublishingFlickrSession* session) {
-	PublishingFlickrAuthenticationRequestTransaction* self = NULL;
-	PublishingFlickrSession* _tmp0_ = NULL;
-#line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL);
-#line 823 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = session;
-#line 823 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self = (PublishingFlickrAuthenticationRequestTransaction*) publishing_flickr_transaction_construct_with_uri (object_type, _tmp0_, "https://www.flickr.com/services/oauth/request_token", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
-#line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return self;
-#line 5436 "FlickrPublishing.c"
-}
-
-
-PublishingFlickrAuthenticationRequestTransaction* publishing_flickr_authentication_request_transaction_new (PublishingFlickrSession* session) {
-#line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return publishing_flickr_authentication_request_transaction_construct (PUBLISHING_FLICKR_TYPE_AUTHENTICATION_REQUEST_TRANSACTION, session);
-#line 5443 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_authentication_request_transaction_class_init (PublishingFlickrAuthenticationRequestTransactionClass * klass) {
-#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_authentication_request_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 5450 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_authentication_request_transaction_instance_init (PublishingFlickrAuthenticationRequestTransaction * self) {
-}
-
-
-GType publishing_flickr_authentication_request_transaction_get_type (void) {
-	static volatile gsize publishing_flickr_authentication_request_transaction_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_flickr_authentication_request_transaction_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (PublishingFlickrAuthenticationRequestTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_flickr_authentication_request_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFlickrAuthenticationRequestTransaction), 0, (GInstanceInitFunc) publishing_flickr_authentication_request_transaction_instance_init, NULL };
-		GType publishing_flickr_authentication_request_transaction_type_id;
-		publishing_flickr_authentication_request_transaction_type_id = g_type_register_static (PUBLISHING_FLICKR_TYPE_TRANSACTION, "PublishingFlickrAuthenticationRequestTransaction", &g_define_type_info, 0);
-		g_once_init_leave (&publishing_flickr_authentication_request_transaction_type_id__volatile, publishing_flickr_authentication_request_transaction_type_id);
-	}
-	return publishing_flickr_authentication_request_transaction_type_id__volatile;
-}
-
-
-PublishingFlickrAccessTokenFetchTransaction* publishing_flickr_access_token_fetch_transaction_construct (GType object_type, PublishingFlickrSession* session, const gchar* user_verifier) {
-	PublishingFlickrAccessTokenFetchTransaction* self = NULL;
-	PublishingFlickrSession* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	PublishingFlickrSession* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL);
-#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (user_verifier != NULL, NULL);
-#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = session;
-#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self = (PublishingFlickrAccessTokenFetchTransaction*) publishing_flickr_transaction_construct_with_uri (object_type, _tmp0_, "https://www.flickr.com/services/oauth/access_token", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
-#line 832 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = user_verifier;
-#line 832 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_verifier", _tmp1_);
-#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = session;
-#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = publishing_flickr_session_get_request_phase_token (_tmp2_);
-#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = _tmp3_;
-#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_token", _tmp4_);
-#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp4_);
-#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return self;
-#line 5501 "FlickrPublishing.c"
-}
-
-
-PublishingFlickrAccessTokenFetchTransaction* publishing_flickr_access_token_fetch_transaction_new (PublishingFlickrSession* session, const gchar* user_verifier) {
-#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return publishing_flickr_access_token_fetch_transaction_construct (PUBLISHING_FLICKR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, session, user_verifier);
-#line 5508 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_access_token_fetch_transaction_class_init (PublishingFlickrAccessTokenFetchTransactionClass * klass) {
-#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_access_token_fetch_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 5515 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_access_token_fetch_transaction_instance_init (PublishingFlickrAccessTokenFetchTransaction * self) {
-}
-
-
-GType publishing_flickr_access_token_fetch_transaction_get_type (void) {
-	static volatile gsize publishing_flickr_access_token_fetch_transaction_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_flickr_access_token_fetch_transaction_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (PublishingFlickrAccessTokenFetchTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_flickr_access_token_fetch_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFlickrAccessTokenFetchTransaction), 0, (GInstanceInitFunc) publishing_flickr_access_token_fetch_transaction_instance_init, NULL };
-		GType publishing_flickr_access_token_fetch_transaction_type_id;
-		publishing_flickr_access_token_fetch_transaction_type_id = g_type_register_static (PUBLISHING_FLICKR_TYPE_TRANSACTION, "PublishingFlickrAccessTokenFetchTransaction", &g_define_type_info, 0);
-		g_once_init_leave (&publishing_flickr_access_token_fetch_transaction_type_id__volatile, publishing_flickr_access_token_fetch_transaction_type_id);
-	}
-	return publishing_flickr_access_token_fetch_transaction_type_id__volatile;
-}
-
-
 PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetch_transaction_construct (GType object_type, PublishingFlickrSession* session) {
 	PublishingFlickrAccountInfoFetchTransaction* self = NULL;
 	PublishingFlickrSession* _tmp0_ = NULL;
 	PublishingFlickrSession* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL);
-#line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = session;
-#line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrAccountInfoFetchTransaction*) publishing_flickr_transaction_construct (object_type, _tmp0_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "flickr.people.getUploadStatus");
-#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = session;
-#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = publishing_flickr_session_get_access_phase_token (_tmp1_);
-#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = _tmp2_;
-#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_token", _tmp3_);
-#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp3_);
-#line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 5561 "FlickrPublishing.c"
+#line 3873 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetch_transaction_new (PublishingFlickrSession* session) {
-#line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_account_info_fetch_transaction_construct (PUBLISHING_FLICKR_TYPE_ACCOUNT_INFO_FETCH_TRANSACTION, session);
-#line 5568 "FlickrPublishing.c"
+#line 3880 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_account_info_fetch_transaction_class_init (PublishingFlickrAccountInfoFetchTransactionClass * klass) {
-#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_account_info_fetch_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 5575 "FlickrPublishing.c"
+#line 3887 "FlickrPublishing.c"
 }
 
 
@@ -5629,23 +3919,23 @@ GType publishing_flickr_account_info_fetch_transaction_get_type (void) {
 
 
 static gpointer _publishing_flickr_publishing_parameters_ref0 (gpointer self) {
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? publishing_flickr_publishing_parameters_ref (self) : NULL;
-#line 5598 "FlickrPublishing.c"
+#line 3910 "FlickrPublishing.c"
 }
 
 
 static gpointer _publishing_rest_support_session_ref0 (gpointer self) {
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? publishing_rest_support_session_ref (self) : NULL;
-#line 5605 "FlickrPublishing.c"
+#line 3917 "FlickrPublishing.c"
 }
 
 
 static void _g_free0_ (gpointer var) {
-#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	var = (g_free (var), NULL);
-#line 5612 "FlickrPublishing.c"
+#line 3924 "FlickrPublishing.c"
 }
 
 
@@ -5667,261 +3957,272 @@ PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_construc
 	PublishingFlickrSession* _tmp13_ = NULL;
 	gchar* _tmp14_ = NULL;
 	gchar* _tmp15_ = NULL;
-	PublishingFlickrPublishingParameters* _tmp16_ = NULL;
-	PublishingFlickrVisibilitySpecification* _tmp17_ = NULL;
-	gint _tmp18_ = 0;
-	gchar* _tmp19_ = NULL;
-	gchar* _tmp20_ = NULL;
-	PublishingFlickrPublishingParameters* _tmp21_ = NULL;
-	PublishingFlickrVisibilitySpecification* _tmp22_ = NULL;
-	gint _tmp23_ = 0;
-	gchar* _tmp24_ = NULL;
-	gchar* _tmp25_ = NULL;
-	PublishingFlickrPublishingParameters* _tmp26_ = NULL;
-	PublishingFlickrVisibilitySpecification* _tmp27_ = NULL;
-	gint _tmp28_ = 0;
-	gchar* _tmp29_ = NULL;
-	gchar* _tmp30_ = NULL;
+	PublishingFlickrSession* _tmp16_ = NULL;
+	gchar* _tmp17_ = NULL;
+	gchar* _tmp18_ = NULL;
+	PublishingFlickrPublishingParameters* _tmp19_ = NULL;
+	PublishingFlickrVisibilitySpecification* _tmp20_ = NULL;
+	gint _tmp21_ = 0;
+	gchar* _tmp22_ = NULL;
+	gchar* _tmp23_ = NULL;
+	PublishingFlickrPublishingParameters* _tmp24_ = NULL;
+	PublishingFlickrVisibilitySpecification* _tmp25_ = NULL;
+	gint _tmp26_ = 0;
+	gchar* _tmp27_ = NULL;
+	gchar* _tmp28_ = NULL;
+	PublishingFlickrPublishingParameters* _tmp29_ = NULL;
+	PublishingFlickrVisibilitySpecification* _tmp30_ = NULL;
+	gint _tmp31_ = 0;
+	gchar* _tmp32_ = NULL;
+	gchar* _tmp33_ = NULL;
 	GHashTable* disposition_table = NULL;
-	GHashFunc _tmp31_ = NULL;
-	GEqualFunc _tmp32_ = NULL;
-	GHashTable* _tmp33_ = NULL;
+	GHashFunc _tmp34_ = NULL;
+	GEqualFunc _tmp35_ = NULL;
+	GHashTable* _tmp36_ = NULL;
 	gchar* filename = NULL;
-	SpitPublishingPublishable* _tmp34_ = NULL;
-	gchar* _tmp35_ = NULL;
-	gboolean _tmp36_ = FALSE;
-	const gchar* _tmp37_ = NULL;
-	GHashTable* _tmp41_ = NULL;
-	gchar* _tmp42_ = NULL;
-	SpitPublishingPublishable* _tmp43_ = NULL;
-	gchar* _tmp44_ = NULL;
+	SpitPublishingPublishable* _tmp37_ = NULL;
+	gchar* _tmp38_ = NULL;
+	gboolean _tmp39_ = FALSE;
+	const gchar* _tmp40_ = NULL;
+	GHashTable* _tmp44_ = NULL;
 	gchar* _tmp45_ = NULL;
-	gchar* _tmp46_ = NULL;
-	GHashTable* _tmp47_ = NULL;
+	SpitPublishingPublishable* _tmp46_ = NULL;
+	gchar* _tmp47_ = NULL;
 	gchar* _tmp48_ = NULL;
 	gchar* _tmp49_ = NULL;
 	GHashTable* _tmp50_ = NULL;
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	gchar* _tmp51_ = NULL;
+	gchar* _tmp52_ = NULL;
+	GHashTable* _tmp53_ = NULL;
+#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL);
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_PARAMETERS (parameters), NULL);
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = session;
-#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = publishable;
-#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrUploadTransaction*) publishing_rest_support_upload_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, "https://api.flickr.com/services/upload");
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = parameters;
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = _publishing_flickr_publishing_parameters_ref0 (_tmp2_);
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->parameters = _tmp3_;
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = session;
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = _publishing_rest_support_session_ref0 (_tmp4_);
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->session = _tmp5_;
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = g_new0 (PublishingRESTSupportArgument*, 0 + 1);
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->auth_header_fields = (_vala_array_free (self->priv->auth_header_fields, self->priv->auth_header_fields_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->auth_header_fields = _tmp6_;
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->auth_header_fields_length1 = 0;
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->_auth_header_fields_size_ = self->priv->auth_header_fields_length1;
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = session;
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = publishing_flickr_session_get_oauth_nonce (_tmp7_);
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = _tmp8_;
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_nonce", _tmp9_);
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp9_);
-#line 859 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_signature_method", "HMAC-SHA1");
-#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_version", "1.0");
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_callback", "oob");
-#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = session;
-#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp11_ = publishing_flickr_session_get_oauth_timestamp (_tmp10_);
-#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp12_ = _tmp11_;
-#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_timestamp", _tmp12_);
-#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp12_);
-#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_consumer_key", PUBLISHING_FLICKR_API_KEY);
-#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp13_ = session;
-#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp14_ = publishing_flickr_session_get_access_phase_token (_tmp13_);
-#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp14_ = publishing_flickr_session_get_consumer_key (_tmp13_);
+#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp15_ = _tmp14_;
-#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_token", _tmp15_);
-#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_consumer_key", _tmp15_);
+#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp15_);
-#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp16_ = parameters;
-#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp17_ = _tmp16_->visibility_specification;
-#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp18_ = _tmp17_->everyone_level;
-#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp19_ = g_strdup_printf ("%d", _tmp18_);
-#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp20_ = _tmp19_;
-#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "is_public", _tmp20_);
-#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp20_);
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp21_ = parameters;
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp22_ = _tmp21_->visibility_specification;
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp23_ = _tmp22_->friends_level;
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp24_ = g_strdup_printf ("%d", _tmp23_);
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp25_ = _tmp24_;
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "is_friend", _tmp25_);
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp25_);
-#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp26_ = parameters;
-#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp27_ = _tmp26_->visibility_specification;
-#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp28_ = _tmp27_->family_level;
-#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp29_ = g_strdup_printf ("%d", _tmp28_);
-#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp30_ = _tmp29_;
-#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "is_family", _tmp30_);
-#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp30_);
-#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp31_ = g_str_hash;
-#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp32_ = g_str_equal;
-#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp33_ = g_hash_table_new_full (_tmp31_, _tmp32_, _g_free0_, _g_free0_);
-#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	disposition_table = _tmp33_;
-#line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp34_ = publishable;
-#line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp35_ = spit_publishing_publishable_get_publishing_name (_tmp34_);
-#line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	filename = _tmp35_;
-#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp37_ = filename;
-#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp37_ == NULL) {
-#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp36_ = TRUE;
-#line 5806 "FlickrPublishing.c"
+#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp16_ = session;
+#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp17_ = publishing_flickr_session_get_access_phase_token (_tmp16_);
+#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp18_ = _tmp17_;
+#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_token", _tmp18_);
+#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_free0 (_tmp18_);
+#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp19_ = parameters;
+#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp20_ = _tmp19_->visibility_specification;
+#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp21_ = _tmp20_->everyone_level;
+#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp22_ = g_strdup_printf ("%d", _tmp21_);
+#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp23_ = _tmp22_;
+#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "is_public", _tmp23_);
+#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_free0 (_tmp23_);
+#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp24_ = parameters;
+#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp25_ = _tmp24_->visibility_specification;
+#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp26_ = _tmp25_->friends_level;
+#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp27_ = g_strdup_printf ("%d", _tmp26_);
+#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp28_ = _tmp27_;
+#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "is_friend", _tmp28_);
+#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_free0 (_tmp28_);
+#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp29_ = parameters;
+#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp30_ = _tmp29_->visibility_specification;
+#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp31_ = _tmp30_->family_level;
+#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp32_ = g_strdup_printf ("%d", _tmp31_);
+#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp33_ = _tmp32_;
+#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "is_family", _tmp33_);
+#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_free0 (_tmp33_);
+#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp34_ = g_str_hash;
+#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp35_ = g_str_equal;
+#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp36_ = g_hash_table_new_full (_tmp34_, _tmp35_, _g_free0_, _g_free0_);
+#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	disposition_table = _tmp36_;
+#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp37_ = publishable;
+#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp38_ = spit_publishing_publishable_get_publishing_name (_tmp37_);
+#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	filename = _tmp38_;
+#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp40_ = filename;
+#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (_tmp40_ == NULL) {
+#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp39_ = TRUE;
+#line 4129 "FlickrPublishing.c"
 	} else {
-		const gchar* _tmp38_ = NULL;
-#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp38_ = filename;
-#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp36_ = g_strcmp0 (_tmp38_, "") == 0;
-#line 5813 "FlickrPublishing.c"
-	}
-#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp36_) {
-#line 5817 "FlickrPublishing.c"
-		SpitPublishingPublishable* _tmp39_ = NULL;
-		gchar* _tmp40_ = NULL;
-#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp39_ = publishable;
-#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp40_ = spit_publishing_publishable_get_param_string (_tmp39_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
-#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		const gchar* _tmp41_ = NULL;
+#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp41_ = filename;
+#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp39_ = g_strcmp0 (_tmp41_, "") == 0;
+#line 4136 "FlickrPublishing.c"
+	}
+#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (_tmp39_) {
+#line 4140 "FlickrPublishing.c"
+		SpitPublishingPublishable* _tmp42_ = NULL;
+		gchar* _tmp43_ = NULL;
+#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp42_ = publishable;
+#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp43_ = spit_publishing_publishable_get_param_string (_tmp42_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
+#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (filename);
-#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		filename = _tmp40_;
-#line 5828 "FlickrPublishing.c"
+#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		filename = _tmp43_;
+#line 4151 "FlickrPublishing.c"
 	}
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp41_ = disposition_table;
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp42_ = g_strdup ("filename");
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp43_ = publishable;
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp44_ = spit_publishing_publishable_get_param_string (_tmp43_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp45_ = _tmp44_;
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp46_ = soup_uri_encode (_tmp45_, NULL);
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_hash_table_insert (_tmp41_, _tmp42_, _tmp46_);
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp45_);
-#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp47_ = disposition_table;
-#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp48_ = g_strdup ("name");
-#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp49_ = g_strdup ("photo");
-#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_hash_table_insert (_tmp47_, _tmp48_, _tmp49_);
-#line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp44_ = disposition_table;
+#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp45_ = g_strdup ("filename");
+#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp46_ = publishable;
+#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp47_ = spit_publishing_publishable_get_param_string (_tmp46_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
+#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp48_ = _tmp47_;
+#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp49_ = soup_uri_encode (_tmp48_, NULL);
+#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_hash_table_insert (_tmp44_, _tmp45_, _tmp49_);
+#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_free0 (_tmp48_);
+#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp50_ = disposition_table;
-#line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_rest_support_upload_transaction_set_binary_disposition_table (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction), _tmp50_);
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp51_ = g_strdup ("name");
+#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp52_ = g_strdup ("photo");
+#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_hash_table_insert (_tmp50_, _tmp51_, _tmp52_);
+#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp53_ = disposition_table;
+#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	publishing_rest_support_upload_transaction_set_binary_disposition_table (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction), _tmp53_);
+#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (filename);
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_hash_table_unref0 (disposition_table);
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 5864 "FlickrPublishing.c"
+#line 4187 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_new (PublishingFlickrSession* session, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublishable* publishable) {
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_upload_transaction_construct (PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION, session, parameters, publishable);
-#line 5871 "FlickrPublishing.c"
+#line 4194 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add18 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value) {
-#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void _vala_array_add19 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value) {
+#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1);
-#line 5882 "FlickrPublishing.c"
+#line 4205 "FlickrPublishing.c"
 	}
-#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 5888 "FlickrPublishing.c"
+#line 4211 "FlickrPublishing.c"
 }
 
 
@@ -5931,53 +4232,53 @@ void publishing_flickr_upload_transaction_add_authorization_header_field (Publis
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	PublishingRESTSupportArgument* _tmp3_ = NULL;
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_UPLOAD_TRANSACTION (self));
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (key != NULL);
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (value != NULL);
-#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->auth_header_fields;
-#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0__length1 = self->priv->auth_header_fields_length1;
-#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = key;
-#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = value;
-#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = publishing_rest_support_argument_new (_tmp1_, _tmp2_);
-#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add18 (&self->priv->auth_header_fields, &self->priv->auth_header_fields_length1, &self->priv->_auth_header_fields_size_, _tmp3_);
-#line 5916 "FlickrPublishing.c"
+#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add19 (&self->priv->auth_header_fields, &self->priv->auth_header_fields_length1, &self->priv->_auth_header_fields_size_, _tmp3_);
+#line 4239 "FlickrPublishing.c"
 }
 
 
 static gpointer _publishing_rest_support_argument_ref0 (gpointer self) {
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? publishing_rest_support_argument_ref (self) : NULL;
-#line 5923 "FlickrPublishing.c"
+#line 4246 "FlickrPublishing.c"
 }
 
 
 static PublishingRESTSupportArgument** _vala_array_dup8 (PublishingRESTSupportArgument** self, int length) {
 	PublishingRESTSupportArgument** result;
 	int i;
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = g_new0 (PublishingRESTSupportArgument*, length + 1);
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 5934 "FlickrPublishing.c"
+#line 4257 "FlickrPublishing.c"
 		PublishingRESTSupportArgument* _tmp0_ = NULL;
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp0_ = _publishing_rest_support_argument_ref0 (self[i]);
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		result[i] = _tmp0_;
-#line 5940 "FlickrPublishing.c"
+#line 4263 "FlickrPublishing.c"
 	}
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 5944 "FlickrPublishing.c"
+#line 4267 "FlickrPublishing.c"
 }
 
 
@@ -5989,31 +4290,31 @@ PublishingRESTSupportArgument** publishing_flickr_upload_transaction_get_authori
 	gint _tmp1__length1 = 0;
 	PublishingRESTSupportArgument** _tmp2_ = NULL;
 	gint _tmp2__length1 = 0;
-#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_UPLOAD_TRANSACTION (self), NULL);
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->auth_header_fields;
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0__length1 = self->priv->auth_header_fields_length1;
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup8 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1__length1 = _tmp0__length1;
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = _tmp1_;
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2__length1 = _tmp1__length1;
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (result_length1) {
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*result_length1 = _tmp2__length1;
-#line 5974 "FlickrPublishing.c"
+#line 4297 "FlickrPublishing.c"
 	}
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp2_;
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 5980 "FlickrPublishing.c"
+#line 4303 "FlickrPublishing.c"
 }
 
 
@@ -6021,25 +4322,25 @@ gchar* publishing_flickr_upload_transaction_get_authorization_header_string (Pub
 	gchar* result = NULL;
 	gchar* _result_ = NULL;
 	gchar* _tmp0_ = NULL;
-#line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_UPLOAD_TRANSACTION (self), NULL);
-#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = g_strdup ("OAuth ");
-#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_result_ = _tmp0_;
-#line 5994 "FlickrPublishing.c"
+#line 4317 "FlickrPublishing.c"
 	{
 		gint i = 0;
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		i = 0;
-#line 5999 "FlickrPublishing.c"
+#line 4322 "FlickrPublishing.c"
 		{
 			gboolean _tmp1_ = FALSE;
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp1_ = TRUE;
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			while (TRUE) {
-#line 6006 "FlickrPublishing.c"
+#line 4329 "FlickrPublishing.c"
 				gint _tmp3_ = 0;
 				PublishingRESTSupportArgument** _tmp4_ = NULL;
 				gint _tmp4__length1 = 0;
@@ -6066,115 +4367,115 @@ gchar* publishing_flickr_upload_transaction_get_authorization_header_string (Pub
 				gint _tmp23_ = 0;
 				PublishingRESTSupportArgument** _tmp24_ = NULL;
 				gint _tmp24__length1 = 0;
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				if (!_tmp1_) {
-#line 6035 "FlickrPublishing.c"
+#line 4358 "FlickrPublishing.c"
 					gint _tmp2_ = 0;
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp2_ = i;
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					i = _tmp2_ + 1;
-#line 6041 "FlickrPublishing.c"
+#line 4364 "FlickrPublishing.c"
 				}
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp1_ = FALSE;
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp3_ = i;
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp4_ = self->priv->auth_header_fields;
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp4__length1 = self->priv->auth_header_fields_length1;
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				if (!(_tmp3_ < _tmp4__length1)) {
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					break;
-#line 6055 "FlickrPublishing.c"
+#line 4378 "FlickrPublishing.c"
 				}
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp5_ = _result_;
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp6_ = self->priv->auth_header_fields;
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp6__length1 = self->priv->auth_header_fields_length1;
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp7_ = i;
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp8_ = _tmp6_[_tmp7_];
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp9_ = _tmp8_->key;
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp10_ = g_strconcat (_tmp5_, _tmp9_, NULL);
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (_result_);
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_result_ = _tmp10_;
-#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp11_ = _result_;
-#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp12_ = g_strconcat (_tmp11_, "=", NULL);
-#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (_result_);
-#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_result_ = _tmp12_;
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp13_ = _result_;
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp14_ = self->priv->auth_header_fields;
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp14__length1 = self->priv->auth_header_fields_length1;
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp15_ = i;
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp16_ = _tmp14_[_tmp15_];
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp17_ = _tmp16_->value;
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp18_ = g_strconcat ("\"", _tmp17_, NULL);
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp19_ = _tmp18_;
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp20_ = g_strconcat (_tmp19_, "\"", NULL);
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp21_ = _tmp20_;
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp22_ = g_strconcat (_tmp13_, _tmp21_, NULL);
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (_result_);
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_result_ = _tmp22_;
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (_tmp21_);
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (_tmp19_);
-#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp23_ = i;
-#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp24_ = self->priv->auth_header_fields;
-#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp24__length1 = self->priv->auth_header_fields_length1;
-#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				if (_tmp23_ < (_tmp24__length1 - 1)) {
-#line 6121 "FlickrPublishing.c"
+#line 4444 "FlickrPublishing.c"
 					const gchar* _tmp25_ = NULL;
 					gchar* _tmp26_ = NULL;
-#line 903 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp25_ = _result_;
-#line 903 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp26_ = g_strconcat (_tmp25_, ", ", NULL);
-#line 903 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_g_free0 (_result_);
-#line 903 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_result_ = _tmp26_;
-#line 6132 "FlickrPublishing.c"
+#line 4455 "FlickrPublishing.c"
 				}
 			}
 		}
 	}
-#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _result_;
-#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 6141 "FlickrPublishing.c"
+#line 4464 "FlickrPublishing.c"
 }
 
 
@@ -6184,85 +4485,85 @@ static void publishing_flickr_upload_transaction_real_execute (PublishingRESTSup
 	gchar* authorization_header = NULL;
 	gchar* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION, PublishingFlickrUploadTransaction);
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->session;
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_session_sign_transaction (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = publishing_flickr_upload_transaction_get_authorization_header_string (self);
-#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	authorization_header = _tmp1_;
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:914: executing upload transaction: authorization" \
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:605: executing upload transaction: authorization" \
 " header string = '%s'", authorization_header);
-#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Authorization", authorization_header);
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_flickr_upload_transaction_parent_class)->execute (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction), PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_propagate_error (error, _inner_error_);
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (authorization_header);
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 6177 "FlickrPublishing.c"
+#line 4500 "FlickrPublishing.c"
 		} else {
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (authorization_header);
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 6187 "FlickrPublishing.c"
+#line 4510 "FlickrPublishing.c"
 		}
 	}
-#line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (authorization_header);
-#line 6192 "FlickrPublishing.c"
+#line 4515 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_upload_transaction_class_init (PublishingFlickrUploadTransactionClass * klass) {
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_upload_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_flickr_upload_transaction_finalize;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFlickrUploadTransactionPrivate));
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_flickr_upload_transaction_real_execute;
-#line 6205 "FlickrPublishing.c"
+#line 4528 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_upload_transaction_instance_init (PublishingFlickrUploadTransaction * self) {
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv = PUBLISHING_FLICKR_UPLOAD_TRANSACTION_GET_PRIVATE (self);
-#line 6212 "FlickrPublishing.c"
+#line 4535 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_upload_transaction_finalize (PublishingRESTSupportTransaction* obj) {
 	PublishingFlickrUploadTransaction * self;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION, PublishingFlickrUploadTransaction);
-#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
-#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->auth_header_fields = (_vala_array_free (self->priv->auth_header_fields, self->priv->auth_header_fields_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_flickr_upload_transaction_parent_class)->finalize (obj);
-#line 6228 "FlickrPublishing.c"
+#line 4551 "FlickrPublishing.c"
 }
 
 
@@ -6280,18 +4581,18 @@ GType publishing_flickr_upload_transaction_get_type (void) {
 
 PublishingFlickrSession* publishing_flickr_session_construct (GType object_type) {
 	PublishingFlickrSession* self = NULL;
-#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrSession*) publishing_rest_support_session_construct (object_type, PUBLISHING_FLICKR_ENDPOINT_URL);
-#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 6250 "FlickrPublishing.c"
+#line 4573 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrSession* publishing_flickr_session_new (void) {
-#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_session_construct (PUBLISHING_FLICKR_TYPE_SESSION);
-#line 6257 "FlickrPublishing.c"
+#line 4580 "FlickrPublishing.c"
 }
 
 
@@ -6301,131 +4602,98 @@ static gboolean publishing_flickr_session_real_is_authenticated (PublishingRESTS
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	const gchar* _tmp2_ = NULL;
-#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSession);
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = self->priv->access_phase_token;
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp2_ != NULL) {
-#line 6273 "FlickrPublishing.c"
+#line 4596 "FlickrPublishing.c"
 		const gchar* _tmp3_ = NULL;
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp3_ = self->priv->access_phase_token_secret;
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 6279 "FlickrPublishing.c"
+#line 4602 "FlickrPublishing.c"
 	} else {
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp1_ = FALSE;
-#line 6283 "FlickrPublishing.c"
+#line 4606 "FlickrPublishing.c"
 	}
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp1_) {
-#line 6287 "FlickrPublishing.c"
+#line 4610 "FlickrPublishing.c"
 		const gchar* _tmp4_ = NULL;
-#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp4_ = self->priv->username;
-#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp0_ = _tmp4_ != NULL;
-#line 6293 "FlickrPublishing.c"
+#line 4616 "FlickrPublishing.c"
 	} else {
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp0_ = FALSE;
-#line 6297 "FlickrPublishing.c"
+#line 4620 "FlickrPublishing.c"
 	}
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp0_;
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 6303 "FlickrPublishing.c"
+#line 4626 "FlickrPublishing.c"
 }
 
 
-void publishing_flickr_session_authenticate_from_persistent_credentials (PublishingFlickrSession* self, const gchar* token, const gchar* secret, const gchar* username) {
+void publishing_flickr_session_set_api_credentials (PublishingFlickrSession* self, const gchar* consumer_key, const gchar* consumer_secret) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_SESSION (self));
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (token != NULL);
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (secret != NULL);
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (username != NULL);
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = token;
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_return_if_fail (consumer_key != NULL);
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_return_if_fail (consumer_secret != NULL);
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp0_ = consumer_key;
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (self->priv->access_phase_token);
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->access_phase_token = _tmp1_;
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = secret;
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_free0 (self->priv->consumer_key);
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->consumer_key = _tmp1_;
+#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp2_ = consumer_secret;
+#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (self->priv->access_phase_token_secret);
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->access_phase_token_secret = _tmp3_;
-#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = username;
-#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = g_strdup (_tmp4_);
-#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (self->priv->username);
-#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->username = _tmp5_;
-#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated");
-#line 6348 "FlickrPublishing.c"
-}
-
-
-void publishing_flickr_session_deauthenticate (PublishingFlickrSession* self) {
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_SESSION (self));
-#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (self->priv->access_phase_token);
-#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->access_phase_token = NULL;
-#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (self->priv->access_phase_token_secret);
-#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->access_phase_token_secret = NULL;
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (self->priv->username);
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->username = NULL;
-#line 6367 "FlickrPublishing.c"
+#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_free0 (self->priv->consumer_secret);
+#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->consumer_secret = _tmp3_;
+#line 4657 "FlickrPublishing.c"
 }
 
 
 static gpointer _publishing_rest_support_transaction_ref0 (gpointer self) {
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? publishing_rest_support_transaction_ref (self) : NULL;
-#line 6374 "FlickrPublishing.c"
+#line 4664 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add19 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value) {
-#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void _vala_array_add20 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value) {
+#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1);
-#line 6385 "FlickrPublishing.c"
+#line 4675 "FlickrPublishing.c"
 	}
-#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 6391 "FlickrPublishing.c"
+#line 4681 "FlickrPublishing.c"
 }
 
 
@@ -6459,11 +4727,10 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self,
 	gchar* signing_key = NULL;
 	const gchar* _tmp46_ = NULL;
 	gchar* signature_base_string = NULL;
-	const gchar* _tmp53_ = NULL;
-	gchar* _tmp54_ = NULL;
+	const gchar* _tmp54_ = NULL;
 	gchar* _tmp55_ = NULL;
-	PublishingRESTSupportTransaction* _tmp56_ = NULL;
-	gchar* _tmp57_ = NULL;
+	gchar* _tmp56_ = NULL;
+	PublishingRESTSupportTransaction* _tmp57_ = NULL;
 	gchar* _tmp58_ = NULL;
 	gchar* _tmp59_ = NULL;
 	gchar* _tmp60_ = NULL;
@@ -6471,66 +4738,67 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self,
 	gchar* _tmp62_ = NULL;
 	gchar* _tmp63_ = NULL;
 	gchar* _tmp64_ = NULL;
-	const gchar* _tmp65_ = NULL;
-	gchar* _tmp66_ = NULL;
+	gchar* _tmp65_ = NULL;
+	const gchar* _tmp66_ = NULL;
 	gchar* _tmp67_ = NULL;
 	gchar* _tmp68_ = NULL;
 	gchar* _tmp69_ = NULL;
-	const gchar* _tmp70_ = NULL;
+	gchar* _tmp70_ = NULL;
 	const gchar* _tmp71_ = NULL;
-	gchar* signature = NULL;
 	const gchar* _tmp72_ = NULL;
+	gchar* signature = NULL;
 	const gchar* _tmp73_ = NULL;
-	gchar* _tmp74_ = NULL;
-	const gchar* _tmp75_ = NULL;
-	gchar* _tmp76_ = NULL;
-	const gchar* _tmp77_ = NULL;
-	PublishingFlickrUploadTransaction* _tmp78_ = NULL;
-#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	const gchar* _tmp74_ = NULL;
+	gchar* _tmp75_ = NULL;
+	const gchar* _tmp76_ = NULL;
+	gchar* _tmp77_ = NULL;
+	const gchar* _tmp78_ = NULL;
+	PublishingFlickrUploadTransaction* _tmp79_ = NULL;
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_SESSION (self));
-#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = txn;
-#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = publishing_rest_support_transaction_get_method (_tmp0_);
-#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = publishing_rest_support_http_method_to_string (_tmp1_);
-#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	http_method = _tmp2_;
-#line 956 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:956: signing transaction with parameters:");
-#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:637: signing transaction with parameters:");
+#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = http_method;
-#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = g_strconcat ("HTTP method = ", _tmp3_, NULL);
-#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = _tmp4_;
-#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:957: %s", _tmp5_);
-#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:638: %s", _tmp5_);
+#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp5_);
-#line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = txn;
-#line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = publishing_rest_support_transaction_get_arguments (_tmp6_, &_tmp7_);
-#line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	base_string_arguments = _tmp8_;
-#line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	base_string_arguments_length1 = _tmp7_;
-#line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_base_string_arguments_size_ = base_string_arguments_length1;
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = txn;
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = _publishing_rest_support_transaction_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION) ? ((PublishingFlickrUploadTransaction*) _tmp9_) : NULL);
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	upload_txn = _tmp10_;
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp11_ = upload_txn;
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp11_ != NULL) {
-#line 6496 "FlickrPublishing.c"
+#line 4786 "FlickrPublishing.c"
 		PublishingRESTSupportArgument** auth_header_args = NULL;
 		PublishingFlickrUploadTransaction* _tmp12_ = NULL;
 		gint _tmp13_ = 0;
@@ -6539,97 +4807,97 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self,
 		gint _auth_header_args_size_ = 0;
 		PublishingRESTSupportArgument** _tmp15_ = NULL;
 		gint _tmp15__length1 = 0;
-#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_debug ("FlickrPublishing.vala:963: %s", "this transaction is an UploadTransaction; including Authorization head" \
+#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		g_debug ("FlickrPublishing.vala:644: %s", "this transaction is an UploadTransaction; including Authorization head" \
 "er " "fields in signature base string");
-#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp12_ = upload_txn;
-#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp14_ = publishing_flickr_upload_transaction_get_authorization_header_fields (_tmp12_, &_tmp13_);
-#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		auth_header_args = _tmp14_;
-#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		auth_header_args_length1 = _tmp13_;
-#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_auth_header_args_size_ = auth_header_args_length1;
-#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp15_ = auth_header_args;
-#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp15__length1 = auth_header_args_length1;
-#line 6521 "FlickrPublishing.c"
+#line 4811 "FlickrPublishing.c"
 		{
 			PublishingRESTSupportArgument** arg_collection = NULL;
 			gint arg_collection_length1 = 0;
 			gint _arg_collection_size_ = 0;
 			gint arg_it = 0;
-#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			arg_collection = _tmp15_;
-#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			arg_collection_length1 = _tmp15__length1;
-#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			for (arg_it = 0; arg_it < _tmp15__length1; arg_it = arg_it + 1) {
-#line 6533 "FlickrPublishing.c"
+#line 4823 "FlickrPublishing.c"
 				PublishingRESTSupportArgument* _tmp16_ = NULL;
 				PublishingRESTSupportArgument* arg = NULL;
-#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp16_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
-#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				arg = _tmp16_;
-#line 6540 "FlickrPublishing.c"
+#line 4830 "FlickrPublishing.c"
 				{
 					PublishingRESTSupportArgument** _tmp17_ = NULL;
 					gint _tmp17__length1 = 0;
 					PublishingRESTSupportArgument* _tmp18_ = NULL;
 					PublishingRESTSupportArgument* _tmp19_ = NULL;
-#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp17_ = base_string_arguments;
-#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp17__length1 = base_string_arguments_length1;
-#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp18_ = arg;
-#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp19_ = _publishing_rest_support_argument_ref0 (_tmp18_);
-#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_vala_array_add19 (&base_string_arguments, &base_string_arguments_length1, &_base_string_arguments_size_, _tmp19_);
-#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+					_vala_array_add20 (&base_string_arguments, &base_string_arguments_length1, &_base_string_arguments_size_, _tmp19_);
+#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_publishing_rest_support_argument_unref0 (arg);
-#line 6558 "FlickrPublishing.c"
+#line 4848 "FlickrPublishing.c"
 				}
 			}
 		}
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		auth_header_args = (_vala_array_free (auth_header_args, auth_header_args_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 6564 "FlickrPublishing.c"
+#line 4854 "FlickrPublishing.c"
 	}
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp20_ = base_string_arguments;
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp20__length1 = base_string_arguments_length1;
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp22_ = publishing_rest_support_argument_sort (_tmp20_, _tmp20__length1, &_tmp21_);
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	sorted_args = _tmp22_;
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	sorted_args_length1 = _tmp21_;
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_sorted_args_size_ = sorted_args_length1;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp23_ = g_strdup ("");
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	arguments_string = _tmp23_;
-#line 6582 "FlickrPublishing.c"
+#line 4872 "FlickrPublishing.c"
 	{
 		gint i = 0;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		i = 0;
-#line 6587 "FlickrPublishing.c"
+#line 4877 "FlickrPublishing.c"
 		{
 			gboolean _tmp24_ = FALSE;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp24_ = TRUE;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			while (TRUE) {
-#line 6594 "FlickrPublishing.c"
+#line 4884 "FlickrPublishing.c"
 				gint _tmp26_ = 0;
 				PublishingRESTSupportArgument** _tmp27_ = NULL;
 				gint _tmp27__length1 = 0;
@@ -6652,299 +4920,260 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self,
 				gint _tmp42_ = 0;
 				PublishingRESTSupportArgument** _tmp43_ = NULL;
 				gint _tmp43__length1 = 0;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				if (!_tmp24_) {
-#line 6619 "FlickrPublishing.c"
+#line 4909 "FlickrPublishing.c"
 					gint _tmp25_ = 0;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp25_ = i;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					i = _tmp25_ + 1;
-#line 6625 "FlickrPublishing.c"
+#line 4915 "FlickrPublishing.c"
 				}
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp24_ = FALSE;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp26_ = i;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp27_ = sorted_args;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp27__length1 = sorted_args_length1;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				if (!(_tmp26_ < _tmp27__length1)) {
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					break;
-#line 6639 "FlickrPublishing.c"
+#line 4929 "FlickrPublishing.c"
 				}
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp28_ = arguments_string;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp29_ = sorted_args;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp29__length1 = sorted_args_length1;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp30_ = i;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp31_ = _tmp29_[_tmp30_];
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp32_ = _tmp31_->key;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp33_ = g_strconcat (_tmp32_, "=", NULL);
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp34_ = _tmp33_;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp35_ = sorted_args;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp35__length1 = sorted_args_length1;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp36_ = i;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp37_ = _tmp35_[_tmp36_];
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp38_ = _tmp37_->value;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp39_ = g_strconcat (_tmp34_, _tmp38_, NULL);
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp40_ = _tmp39_;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp41_ = g_strconcat (_tmp28_, _tmp40_, NULL);
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (arguments_string);
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				arguments_string = _tmp41_;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (_tmp40_);
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (_tmp34_);
-#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp42_ = i;
-#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp43_ = sorted_args;
-#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp43__length1 = sorted_args_length1;
-#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				if (_tmp42_ < (_tmp43__length1 - 1)) {
-#line 6689 "FlickrPublishing.c"
+#line 4979 "FlickrPublishing.c"
 					const gchar* _tmp44_ = NULL;
 					gchar* _tmp45_ = NULL;
-#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp44_ = arguments_string;
-#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp45_ = g_strconcat (_tmp44_, "&", NULL);
-#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_g_free0 (arguments_string);
-#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					arguments_string = _tmp45_;
-#line 6700 "FlickrPublishing.c"
+#line 4990 "FlickrPublishing.c"
 				}
 			}
 		}
 	}
-#line 983 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	signing_key = NULL;
-#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp46_ = self->priv->access_phase_token_secret;
-#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp46_ != NULL) {
-#line 6711 "FlickrPublishing.c"
+#line 5001 "FlickrPublishing.c"
 		const gchar* _tmp47_ = NULL;
 		gchar* _tmp48_ = NULL;
-#line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_debug ("FlickrPublishing.vala:985: access phase token secret available; using " \
+		gchar* _tmp49_ = NULL;
+		const gchar* _tmp50_ = NULL;
+		gchar* _tmp51_ = NULL;
+#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		g_debug ("FlickrPublishing.vala:666: access phase token secret available; using " \
 "it as signing key");
-#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp47_ = self->priv->access_phase_token_secret;
-#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp48_ = g_strconcat (PUBLISHING_FLICKR_API_SECRET "&", _tmp47_, NULL);
-#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp47_ = self->priv->consumer_secret;
+#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp48_ = g_strconcat (_tmp47_, "&", NULL);
+#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp49_ = _tmp48_;
+#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp50_ = self->priv->access_phase_token_secret;
+#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp51_ = g_strconcat (_tmp49_, _tmp50_, NULL);
+#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (signing_key);
-#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		signing_key = _tmp48_;
-#line 6724 "FlickrPublishing.c"
+#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		signing_key = _tmp51_;
+#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_g_free0 (_tmp49_);
+#line 5025 "FlickrPublishing.c"
 	} else {
-		const gchar* _tmp49_ = NULL;
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp49_ = self->priv->request_phase_token_secret;
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		if (_tmp49_ != NULL) {
-#line 6731 "FlickrPublishing.c"
-			const gchar* _tmp50_ = NULL;
-			gchar* _tmp51_ = NULL;
-#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			g_debug ("FlickrPublishing.vala:989: request phase token secret available; using" \
-" it as signing key");
-#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_tmp50_ = self->priv->request_phase_token_secret;
-#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_tmp51_ = g_strconcat (PUBLISHING_FLICKR_API_SECRET "&", _tmp50_, NULL);
-#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_g_free0 (signing_key);
-#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			signing_key = _tmp51_;
-#line 6744 "FlickrPublishing.c"
-		} else {
-			gchar* _tmp52_ = NULL;
-#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			g_debug ("FlickrPublishing.vala:993: %s", "neither access phase nor request phase token secrets available; using " \
+		const gchar* _tmp52_ = NULL;
+		gchar* _tmp53_ = NULL;
+#line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		g_debug ("FlickrPublishing.vala:670: %s", "neither access phase nor request phase token secrets available; using " \
 "API " "key as signing key");
-#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_tmp52_ = g_strdup (PUBLISHING_FLICKR_API_SECRET "&");
-#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_g_free0 (signing_key);
-#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			signing_key = _tmp52_;
-#line 6755 "FlickrPublishing.c"
-		}
-	}
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp53_ = http_method;
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp54_ = g_strconcat (_tmp53_, "&", NULL);
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp55_ = _tmp54_;
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp56_ = txn;
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp57_ = publishing_rest_support_transaction_get_endpoint_url (_tmp56_);
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp58_ = _tmp57_;
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp59_ = soup_uri_encode (_tmp58_, PUBLISHING_FLICKR_ENCODE_RFC_3986_EXTRA);
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp60_ = _tmp59_;
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp61_ = g_strconcat (_tmp55_, _tmp60_, NULL);
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp62_ = _tmp61_;
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp63_ = g_strconcat (_tmp62_, "&", NULL);
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp64_ = _tmp63_;
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp65_ = arguments_string;
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp66_ = soup_uri_encode (_tmp65_, PUBLISHING_FLICKR_ENCODE_RFC_3986_EXTRA);
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp67_ = _tmp66_;
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp68_ = g_strconcat (_tmp64_, _tmp67_, NULL);
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp69_ = _tmp68_;
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp67_);
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp64_);
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp62_);
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp60_);
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp58_);
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp55_);
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	signature_base_string = _tmp69_;
-#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp70_ = signature_base_string;
-#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:1003: signature base string = '%s'", _tmp70_);
-#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp71_ = signing_key;
-#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:1005: signing key = '%s'", _tmp71_);
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 673 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp52_ = self->priv->consumer_secret;
+#line 673 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp53_ = g_strconcat (_tmp52_, "&", NULL);
+#line 673 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_g_free0 (signing_key);
+#line 673 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		signing_key = _tmp53_;
+#line 5039 "FlickrPublishing.c"
+	}
+#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp54_ = http_method;
+#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp55_ = g_strconcat (_tmp54_, "&", NULL);
+#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp56_ = _tmp55_;
+#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp57_ = txn;
+#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp58_ = publishing_rest_support_transaction_get_endpoint_url (_tmp57_);
+#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp59_ = _tmp58_;
+#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp60_ = soup_uri_encode (_tmp59_, PUBLISHING_FLICKR_ENCODE_RFC_3986_EXTRA);
+#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp61_ = _tmp60_;
+#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp62_ = g_strconcat (_tmp56_, _tmp61_, NULL);
+#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp63_ = _tmp62_;
+#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp64_ = g_strconcat (_tmp63_, "&", NULL);
+#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp65_ = _tmp64_;
+#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp66_ = arguments_string;
+#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp67_ = soup_uri_encode (_tmp66_, PUBLISHING_FLICKR_ENCODE_RFC_3986_EXTRA);
+#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp68_ = _tmp67_;
+#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp69_ = g_strconcat (_tmp65_, _tmp68_, NULL);
+#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp70_ = _tmp69_;
+#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_free0 (_tmp68_);
+#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_free0 (_tmp65_);
+#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_free0 (_tmp63_);
+#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_free0 (_tmp61_);
+#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_free0 (_tmp59_);
+#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_free0 (_tmp56_);
+#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	signature_base_string = _tmp70_;
+#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp71_ = signature_base_string;
+#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:680: signature base string = '%s'", _tmp71_);
+#line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp72_ = signing_key;
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp73_ = signature_base_string;
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp74_ = publishing_rest_support_hmac_sha1 (_tmp72_, _tmp73_);
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	signature = _tmp74_;
-#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp75_ = signature;
-#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp76_ = soup_uri_encode (_tmp75_, PUBLISHING_FLICKR_ENCODE_RFC_3986_EXTRA);
-#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:682: signing key = '%s'", _tmp72_);
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp73_ = signing_key;
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp74_ = signature_base_string;
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp75_ = publishing_rest_support_hmac_sha1 (_tmp73_, _tmp74_);
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	signature = _tmp75_;
+#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp76_ = signature;
+#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp77_ = soup_uri_encode (_tmp76_, PUBLISHING_FLICKR_ENCODE_RFC_3986_EXTRA);
+#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (signature);
-#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	signature = _tmp76_;
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp77_ = signature;
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:1011: signature = '%s'", _tmp77_);
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp78_ = upload_txn;
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp78_ != NULL) {
-#line 6838 "FlickrPublishing.c"
-		PublishingFlickrUploadTransaction* _tmp79_ = NULL;
-		const gchar* _tmp80_ = NULL;
-#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp79_ = upload_txn;
-#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp80_ = signature;
-#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		publishing_flickr_upload_transaction_add_authorization_header_field (_tmp79_, "oauth_signature", _tmp80_);
-#line 6847 "FlickrPublishing.c"
+#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	signature = _tmp77_;
+#line 688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp78_ = signature;
+#line 688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:688: signature = '%s'", _tmp78_);
+#line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp79_ = upload_txn;
+#line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (_tmp79_ != NULL) {
+#line 5121 "FlickrPublishing.c"
+		PublishingFlickrUploadTransaction* _tmp80_ = NULL;
+		const gchar* _tmp81_ = NULL;
+#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp80_ = upload_txn;
+#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp81_ = signature;
+#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		publishing_flickr_upload_transaction_add_authorization_header_field (_tmp80_, "oauth_signature", _tmp81_);
+#line 5130 "FlickrPublishing.c"
 	} else {
-		PublishingRESTSupportTransaction* _tmp81_ = NULL;
-		const gchar* _tmp82_ = NULL;
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp81_ = txn;
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp82_ = signature;
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		publishing_rest_support_transaction_add_argument (_tmp81_, "oauth_signature", _tmp82_);
-#line 6857 "FlickrPublishing.c"
-	}
-#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		PublishingRESTSupportTransaction* _tmp82_ = NULL;
+		const gchar* _tmp83_ = NULL;
+#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp82_ = txn;
+#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp83_ = signature;
+#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		publishing_rest_support_transaction_add_argument (_tmp82_, "oauth_signature", _tmp83_);
+#line 5140 "FlickrPublishing.c"
+	}
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (signature);
-#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (signature_base_string);
-#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (signing_key);
-#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (arguments_string);
-#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	sorted_args = (_vala_array_free (sorted_args, sorted_args_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (upload_txn);
-#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	base_string_arguments = (_vala_array_free (base_string_arguments, base_string_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (http_method);
-#line 6875 "FlickrPublishing.c"
-}
-
-
-void publishing_flickr_session_set_request_phase_credentials (PublishingFlickrSession* self, const gchar* token, const gchar* secret) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_SESSION (self));
-#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (token != NULL);
-#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (secret != NULL);
-#line 1020 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = token;
-#line 1020 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 1020 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (self->priv->request_phase_token);
-#line 1020 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->request_phase_token = _tmp1_;
-#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = secret;
-#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = g_strdup (_tmp2_);
-#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (self->priv->request_phase_token_secret);
-#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->request_phase_token_secret = _tmp3_;
-#line 6906 "FlickrPublishing.c"
+#line 5158 "FlickrPublishing.c"
 }
 
 
@@ -6955,41 +5184,41 @@ void publishing_flickr_session_set_access_phase_credentials (PublishingFlickrSes
 	gchar* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
 	gchar* _tmp5_ = NULL;
-#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_SESSION (self));
-#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (token != NULL);
-#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (secret != NULL);
-#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (username != NULL);
-#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = token;
-#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->priv->access_phase_token);
-#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->access_phase_token = _tmp1_;
-#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = secret;
-#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->priv->access_phase_token_secret);
-#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->access_phase_token_secret = _tmp3_;
-#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = username;
-#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = g_strdup (_tmp4_);
-#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->priv->username);
-#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->username = _tmp5_;
-#line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated");
-#line 6951 "FlickrPublishing.c"
+#line 5203 "FlickrPublishing.c"
 }
 
 
@@ -7008,47 +5237,47 @@ gchar* publishing_flickr_session_get_oauth_nonce (PublishingFlickrSession* self)
 	gchar* _tmp9_ = NULL;
 	gchar* _tmp10_ = NULL;
 	gchar* _tmp11_ = NULL;
-#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL);
-#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_get_current_time (&currtime);
-#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_get_current_time (&currtime);
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = currtime;
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = _tmp0_.tv_sec;
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = g_strdup_printf ("%li", _tmp1_);
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = _tmp2_;
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = currtime;
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = _tmp4_.tv_usec;
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = g_strdup_printf ("%li", _tmp5_);
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = _tmp6_;
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = g_strconcat (_tmp3_, _tmp7_, NULL);
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = _tmp8_;
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = g_compute_checksum_for_string (G_CHECKSUM_MD5, _tmp9_, (gsize) -1);
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp11_ = _tmp10_;
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp9_);
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp7_);
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp3_);
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp11_;
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 7010 "FlickrPublishing.c"
+#line 5262 "FlickrPublishing.c"
 }
 
 
@@ -7071,7 +5300,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 7033 "FlickrPublishing.c"
+#line 5285 "FlickrPublishing.c"
 		glong _tmp4_ = 0L;
 #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
@@ -7079,7 +5308,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 7041 "FlickrPublishing.c"
+#line 5293 "FlickrPublishing.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
@@ -7091,7 +5320,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 7053 "FlickrPublishing.c"
+#line 5305 "FlickrPublishing.c"
 	}
 }
 
@@ -7115,21 +5344,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 7077 "FlickrPublishing.c"
+#line 5329 "FlickrPublishing.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 7083 "FlickrPublishing.c"
+#line 5335 "FlickrPublishing.c"
 	} else {
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 7087 "FlickrPublishing.c"
+#line 5339 "FlickrPublishing.c"
 	}
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 7091 "FlickrPublishing.c"
+#line 5343 "FlickrPublishing.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
@@ -7141,7 +5370,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 7103 "FlickrPublishing.c"
+#line 5355 "FlickrPublishing.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
@@ -7151,13 +5380,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 7113 "FlickrPublishing.c"
+#line 5365 "FlickrPublishing.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 7119 "FlickrPublishing.c"
+#line 5371 "FlickrPublishing.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
@@ -7171,7 +5400,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 7133 "FlickrPublishing.c"
+#line 5385 "FlickrPublishing.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
@@ -7181,13 +5410,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 7143 "FlickrPublishing.c"
+#line 5395 "FlickrPublishing.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 7149 "FlickrPublishing.c"
+#line 5401 "FlickrPublishing.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
 #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -7196,7 +5425,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 7158 "FlickrPublishing.c"
+#line 5410 "FlickrPublishing.c"
 	}
 #line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
@@ -7216,7 +5445,7 @@ 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 7178 "FlickrPublishing.c"
+#line 5430 "FlickrPublishing.c"
 }
 
 
@@ -7227,48 +5456,48 @@ gchar* publishing_flickr_session_get_oauth_timestamp (PublishingFlickrSession* s
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	gchar* _tmp4_ = NULL;
-#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL);
-#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = g_get_real_time ();
-#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp0_);
-#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = _tmp1_;
-#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = string_substring (_tmp2_, (glong) 0, (glong) 10);
-#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = _tmp3_;
-#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp2_);
-#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp4_;
-#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 7207 "FlickrPublishing.c"
+#line 5459 "FlickrPublishing.c"
 }
 
 
-gchar* publishing_flickr_session_get_request_phase_token (PublishingFlickrSession* self) {
+gchar* publishing_flickr_session_get_consumer_key (PublishingFlickrSession* self) {
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL);
-#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->request_phase_token;
-#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_assert (_tmp0_ != NULL, "request_phase_token != null");
-#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = self->priv->request_phase_token;
-#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp0_ = self->priv->consumer_key;
+#line 717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_assert (_tmp0_ != NULL, "consumer_key != null");
+#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp1_ = self->priv->consumer_key;
+#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp2_;
-#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 7230 "FlickrPublishing.c"
+#line 5482 "FlickrPublishing.c"
 }
 
 
@@ -7277,44 +5506,21 @@ gchar* publishing_flickr_session_get_access_phase_token (PublishingFlickrSession
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL);
-#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->access_phase_token;
-#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_vala_assert (_tmp0_ != NULL, "access_phase_token != null");
-#line 1051 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->access_phase_token;
-#line 1051 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = g_strdup (_tmp1_);
-#line 1051 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	result = _tmp2_;
-#line 1051 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return result;
-#line 7253 "FlickrPublishing.c"
-}
-
-
-gchar* publishing_flickr_session_get_access_phase_token_secret (PublishingFlickrSession* self) {
-	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-#line 1054 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL);
-#line 1055 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->access_phase_token_secret;
-#line 1055 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_assert (_tmp0_ != NULL, "access_phase_token_secret != null");
-#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = self->priv->access_phase_token_secret;
-#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp2_;
-#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 7276 "FlickrPublishing.c"
+#line 5505 "FlickrPublishing.c"
 }
 
 
@@ -7323,71 +5529,71 @@ gchar* publishing_flickr_session_get_username (PublishingFlickrSession* self) {
 	gboolean _tmp0_ = FALSE;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL);
-#line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_vala_assert (_tmp0_, "is_authenticated()");
-#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->username;
-#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp2_;
-#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 7299 "FlickrPublishing.c"
+#line 5528 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_session_class_init (PublishingFlickrSessionClass * klass) {
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_session_parent_class = g_type_class_peek_parent (klass);
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingRESTSupportSessionClass *) klass)->finalize = publishing_flickr_session_finalize;
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFlickrSessionPrivate));
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = publishing_flickr_session_real_is_authenticated;
-#line 7312 "FlickrPublishing.c"
+#line 5541 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_session_instance_init (PublishingFlickrSession * self) {
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv = PUBLISHING_FLICKR_SESSION_GET_PRIVATE (self);
-#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->request_phase_token = NULL;
-#line 924 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->request_phase_token_secret = NULL;
-#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->access_phase_token = NULL;
-#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->access_phase_token_secret = NULL;
-#line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->username = NULL;
-#line 7329 "FlickrPublishing.c"
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->consumer_key = NULL;
+#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->consumer_secret = NULL;
+#line 5558 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_session_finalize (PublishingRESTSupportSession* obj) {
 	PublishingFlickrSession * self;
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSession);
-#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (self->priv->request_phase_token);
-#line 924 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (self->priv->request_phase_token_secret);
-#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->priv->access_phase_token);
-#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->priv->access_phase_token_secret);
-#line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->priv->username);
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_free0 (self->priv->consumer_key);
+#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_free0 (self->priv->consumer_secret);
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_flickr_session_parent_class)->finalize (obj);
-#line 7349 "FlickrPublishing.c"
+#line 5578 "FlickrPublishing.c"
 }
 
 
@@ -7404,30 +5610,30 @@ GType publishing_flickr_session_get_type (void) {
 
 
 static void _publishing_flickr_publishing_options_pane_on_visibility_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_on_visibility_changed ((PublishingFlickrPublishingOptionsPane*) self);
-#line 7368 "FlickrPublishing.c"
+#line 5597 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_on_size_changed ((PublishingFlickrPublishingOptionsPane*) self);
-#line 7375 "FlickrPublishing.c"
+#line 5604 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_on_logout_clicked ((PublishingFlickrPublishingOptionsPane*) self);
-#line 7382 "FlickrPublishing.c"
+#line 5611 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_on_publish_clicked ((PublishingFlickrPublishingOptionsPane*) self);
-#line 7389 "FlickrPublishing.c"
+#line 5618 "FlickrPublishing.c"
 }
 
 
@@ -7467,399 +5673,435 @@ PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane
 	GtkBuilder* _tmp31_ = NULL;
 	GObject* _tmp32_ = NULL;
 	GtkCheckButton* _tmp33_ = NULL;
-	PublishingFlickrPublishingParameters* _tmp34_ = NULL;
-	PublishingFlickrPublishingParameters* _tmp35_ = NULL;
-	PublishingFlickrFlickrPublisher* _tmp36_ = NULL;
-	PublishingFlickrFlickrPublisher* _tmp37_ = NULL;
-	SpitPublishingPublisherMediaType _tmp38_ = 0;
-	gint _tmp39_ = 0;
-	PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp40_ = NULL;
-	gint _tmp41_ = 0;
-	PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp42_ = NULL;
-	gchar* upload_label_text = NULL;
-	const gchar* _tmp43_ = NULL;
+	PublishingFlickrFlickrPublisher* _tmp34_ = NULL;
+	SpitPublishingAuthenticator* _tmp35_ = NULL;
+	SpitPublishingAuthenticator* _tmp36_ = NULL;
+	gboolean _tmp37_ = FALSE;
+	gboolean _tmp38_ = FALSE;
+	PublishingFlickrPublishingParameters* _tmp43_ = NULL;
 	PublishingFlickrPublishingParameters* _tmp44_ = NULL;
-	const gchar* _tmp45_ = NULL;
-	gchar* _tmp46_ = NULL;
-	PublishingFlickrPublishingParameters* _tmp47_ = NULL;
-	PublishingFlickrUserKind _tmp48_ = 0;
-	GtkLabel* _tmp61_ = NULL;
-	const gchar* _tmp62_ = NULL;
+	PublishingFlickrFlickrPublisher* _tmp45_ = NULL;
+	PublishingFlickrFlickrPublisher* _tmp46_ = NULL;
+	SpitPublishingPublisherMediaType _tmp47_ = 0;
+	gint _tmp48_ = 0;
+	PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp49_ = NULL;
+	gint _tmp50_ = 0;
+	PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp51_ = NULL;
+	gchar* upload_label_text = NULL;
+	const gchar* _tmp52_ = NULL;
+	PublishingFlickrPublishingParameters* _tmp53_ = NULL;
+	const gchar* _tmp54_ = NULL;
+	gchar* _tmp55_ = NULL;
+	PublishingFlickrPublishingParameters* _tmp56_ = NULL;
+	PublishingFlickrUserKind _tmp57_ = 0;
+	GtkLabel* _tmp70_ = NULL;
+	const gchar* _tmp71_ = NULL;
 	gchar* visibility_label_text = NULL;
-	const gchar* _tmp63_ = NULL;
-	gchar* _tmp64_ = NULL;
-	SpitPublishingPublisherMediaType _tmp65_ = 0;
-	GtkLabel* _tmp71_ = NULL;
 	const gchar* _tmp72_ = NULL;
-	GtkComboBoxText* _tmp73_ = NULL;
+	gchar* _tmp73_ = NULL;
 	SpitPublishingPublisherMediaType _tmp74_ = 0;
-	GtkCheckButton* _tmp78_ = NULL;
-	gboolean _tmp79_ = FALSE;
-	GtkButton* _tmp80_ = NULL;
-	GtkButton* _tmp81_ = NULL;
-#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	GtkLabel* _tmp80_ = NULL;
+	const gchar* _tmp81_ = NULL;
+	GtkComboBoxText* _tmp82_ = NULL;
+	SpitPublishingPublisherMediaType _tmp83_ = 0;
+	GtkCheckButton* _tmp87_ = NULL;
+	gboolean _tmp88_ = FALSE;
+	GtkButton* _tmp89_ = NULL;
+	GtkButton* _tmp90_ = NULL;
+#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (publisher), NULL);
-#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_PARAMETERS (parameters), NULL);
-#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (GTK_IS_BUILDER (builder), NULL);
-#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrPublishingOptionsPane*) g_object_new (object_type, NULL);
-#line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = builder;
-#line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->builder = _tmp1_;
-#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = builder;
-#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_vala_assert (_tmp2_ != NULL, "builder != null");
-#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = builder;
-#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = gtk_builder_get_objects (_tmp3_);
-#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = _tmp4_;
-#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = g_slist_length (_tmp5_);
-#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_vala_assert (_tmp6_ > ((guint) 0), "builder.get_objects().length() > 0");
-#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_slist_free0 (_tmp5_);
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = self->priv->builder;
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = gtk_builder_get_object (_tmp7_, "flickr_pane");
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_box_get_type (), GtkBox));
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->pane_widget);
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->pane_widget = _tmp9_;
-#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = self->priv->builder;
-#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp11_ = gtk_builder_get_object (_tmp10_, "visibility_label");
-#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_label_get_type (), GtkLabel));
-#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->visibility_label);
-#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->visibility_label = _tmp12_;
-#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp13_ = self->priv->builder;
-#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14_ = gtk_builder_get_object (_tmp13_, "upload_info_label");
-#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_label_get_type (), GtkLabel));
-#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->upload_info_label);
-#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->upload_info_label = _tmp15_;
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp16_ = self->priv->builder;
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp17_ = gtk_builder_get_object (_tmp16_, "logout_button");
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_button_get_type (), GtkButton));
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->logout_button);
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->logout_button = _tmp18_;
-#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp19_ = self->priv->builder;
-#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp20_ = gtk_builder_get_object (_tmp19_, "publish_button");
-#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_button_get_type (), GtkButton));
-#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->publish_button);
-#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->publish_button = _tmp21_;
-#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp22_ = self->priv->builder;
-#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp23_ = gtk_builder_get_object (_tmp22_, "visibility_combo");
-#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_combo_box_text_get_type (), GtkComboBoxText));
-#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->visibility_combo);
-#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->visibility_combo = _tmp24_;
-#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp25_ = self->priv->builder;
-#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp26_ = gtk_builder_get_object (_tmp25_, "size_combo");
-#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_combo_box_text_get_type (), GtkComboBoxText));
-#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->size_combo);
-#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->size_combo = _tmp27_;
-#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp28_ = self->priv->builder;
-#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp29_ = gtk_builder_get_object (_tmp28_, "size_label");
-#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_label_get_type (), GtkLabel));
-#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->size_label);
-#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->size_label = _tmp30_;
-#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp31_ = self->priv->builder;
-#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp32_ = gtk_builder_get_object (_tmp31_, "strip_metadata_check");
-#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_check_button_get_type (), GtkCheckButton));
-#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->strip_metadata_check);
-#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->strip_metadata_check = _tmp33_;
-#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp34_ = parameters;
-#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp35_ = _publishing_flickr_publishing_parameters_ref0 (_tmp34_);
-#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp34_ = publisher;
+#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp35_ = publishing_flickr_flickr_publisher_get_authenticator (_tmp34_);
+#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp36_ = _tmp35_;
+#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp37_ = spit_publishing_authenticator_can_logout (_tmp36_);
+#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp38_ = !_tmp37_;
+#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_object_unref0 (_tmp36_);
+#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (_tmp38_) {
+#line 5829 "FlickrPublishing.c"
+		GtkButton* _tmp39_ = NULL;
+		GtkContainer* _tmp40_ = NULL;
+		GtkContainer* _tmp41_ = NULL;
+		GtkButton* _tmp42_ = NULL;
+#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp39_ = self->priv->logout_button;
+#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp40_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget));
+#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp41_ = _tmp40_;
+#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp42_ = self->priv->logout_button;
+#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		gtk_container_remove (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget));
+#line 5844 "FlickrPublishing.c"
+	}
+#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp43_ = parameters;
+#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp44_ = _publishing_flickr_publishing_parameters_ref0 (_tmp43_);
+#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
-#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->parameters = _tmp35_;
-#line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp36_ = publisher;
-#line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp37_ = _g_object_ref0 (_tmp36_);
-#line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->parameters = _tmp44_;
+#line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp45_ = publisher;
+#line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp46_ = _g_object_ref0 (_tmp45_);
+#line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->publisher);
-#line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->publisher = _tmp37_;
-#line 1124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp38_ = media_type;
-#line 1124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->media_type = _tmp38_;
-#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp40_ = publishing_flickr_publishing_options_pane_create_visibilities (self, &_tmp39_);
-#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->publisher = _tmp46_;
+#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp47_ = media_type;
+#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->media_type = _tmp47_;
+#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp49_ = publishing_flickr_publishing_options_pane_create_visibilities (self, &_tmp48_);
+#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->visibilities = (_vala_array_free (self->priv->visibilities, self->priv->visibilities_length1, (GDestroyNotify) publishing_flickr_publishing_options_pane_visibility_entry_unref), NULL);
-#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->visibilities = _tmp40_;
-#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->visibilities_length1 = _tmp39_;
-#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->visibilities = _tmp49_;
+#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->visibilities_length1 = _tmp48_;
+#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->_visibilities_size_ = self->priv->visibilities_length1;
-#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp42_ = publishing_flickr_publishing_options_pane_create_sizes (self, &_tmp41_);
-#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp51_ = publishing_flickr_publishing_options_pane_create_sizes (self, &_tmp50_);
+#line 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->sizes = (_vala_array_free (self->priv->sizes, self->priv->sizes_length1, (GDestroyNotify) publishing_flickr_publishing_options_pane_size_entry_unref), NULL);
-#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->sizes = _tmp42_;
-#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->sizes_length1 = _tmp41_;
-#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->sizes = _tmp51_;
+#line 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->sizes_length1 = _tmp50_;
+#line 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->_sizes_size_ = self->priv->sizes_length1;
-#line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp43_ = _ ("You are logged into Flickr as %s.\n\n");
-#line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp44_ = parameters;
-#line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp45_ = _tmp44_->username;
-#line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp46_ = g_strdup_printf (_tmp43_, _tmp45_);
-#line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	upload_label_text = _tmp46_;
-#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp47_ = parameters;
-#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp48_ = _tmp47_->user_kind;
-#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp48_ == PUBLISHING_FLICKR_USER_KIND_FREE) {
-#line 7637 "FlickrPublishing.c"
-		const gchar* _tmp49_ = NULL;
-		const gchar* _tmp50_ = NULL;
-		PublishingFlickrPublishingParameters* _tmp51_ = NULL;
-		gint64 _tmp52_ = 0LL;
-		gchar* _tmp53_ = NULL;
-		gchar* _tmp54_ = NULL;
-		gchar* _tmp55_ = NULL;
-		gchar* _tmp56_ = NULL;
-		gchar* _tmp57_ = NULL;
-#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp49_ = upload_label_text;
-#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp50_ = _ ("Your free Flickr account limits how much data you can upload per month" \
+#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp52_ = _ ("You are logged into Flickr as %s.\n\n");
+#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp53_ = parameters;
+#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp54_ = _tmp53_->username;
+#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp55_ = g_strdup_printf (_tmp52_, _tmp54_);
+#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	upload_label_text = _tmp55_;
+#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp56_ = parameters;
+#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp57_ = _tmp56_->user_kind;
+#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (_tmp57_ == PUBLISHING_FLICKR_USER_KIND_FREE) {
+#line 5902 "FlickrPublishing.c"
+		const gchar* _tmp58_ = NULL;
+		const gchar* _tmp59_ = NULL;
+		PublishingFlickrPublishingParameters* _tmp60_ = NULL;
+		gint64 _tmp61_ = 0LL;
+		gchar* _tmp62_ = NULL;
+		gchar* _tmp63_ = NULL;
+		gchar* _tmp64_ = NULL;
+		gchar* _tmp65_ = NULL;
+		gchar* _tmp66_ = NULL;
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp58_ = upload_label_text;
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp59_ = _ ("Your free Flickr account limits how much data you can upload per month" \
 ".\n" \
 "This month you have %s remaining in your upload quota.");
-#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp51_ = parameters;
-#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp52_ = _tmp51_->quota_free_bytes;
-#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp53_ = g_format_size_full ((guint64) _tmp52_, G_FORMAT_SIZE_LONG_FORMAT | G_FORMAT_SIZE_IEC_UNITS);
-#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp54_ = _tmp53_;
-#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp55_ = g_strdup_printf (_tmp50_, _tmp54_);
-#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp56_ = _tmp55_;
-#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp57_ = g_strconcat (_tmp49_, _tmp56_, NULL);
-#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp60_ = parameters;
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp61_ = _tmp60_->quota_free_bytes;
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp62_ = g_format_size_full ((guint64) _tmp61_, G_FORMAT_SIZE_LONG_FORMAT | G_FORMAT_SIZE_IEC_UNITS);
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp63_ = _tmp62_;
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp64_ = g_strdup_printf (_tmp59_, _tmp63_);
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp65_ = _tmp64_;
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp66_ = g_strconcat (_tmp58_, _tmp65_, NULL);
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (upload_label_text);
-#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		upload_label_text = _tmp57_;
-#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_free0 (_tmp56_);
-#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_free0 (_tmp54_);
-#line 7673 "FlickrPublishing.c"
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		upload_label_text = _tmp66_;
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_g_free0 (_tmp65_);
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_g_free0 (_tmp63_);
+#line 5938 "FlickrPublishing.c"
 	} else {
-		const gchar* _tmp58_ = NULL;
-		const gchar* _tmp59_ = NULL;
-		gchar* _tmp60_ = NULL;
-#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp58_ = upload_label_text;
-#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp59_ = _ ("Your Flickr Pro account entitles you to unlimited uploads.");
-#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp60_ = g_strconcat (_tmp58_, _tmp59_, NULL);
-#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		const gchar* _tmp67_ = NULL;
+		const gchar* _tmp68_ = NULL;
+		gchar* _tmp69_ = NULL;
+#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp67_ = upload_label_text;
+#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp68_ = _ ("Your Flickr Pro account entitles you to unlimited uploads.");
+#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp69_ = g_strconcat (_tmp67_, _tmp68_, NULL);
+#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (upload_label_text);
-#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		upload_label_text = _tmp60_;
-#line 7688 "FlickrPublishing.c"
-	}
-#line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp61_ = self->priv->upload_info_label;
-#line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp62_ = upload_label_text;
-#line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	gtk_label_set_label (_tmp61_, _tmp62_);
-#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp63_ = _ ("Photos _visible to:");
-#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp64_ = g_strdup (_tmp63_);
-#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	visibility_label_text = _tmp64_;
-#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp65_ = media_type;
-#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp65_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 7706 "FlickrPublishing.c"
-		const gchar* _tmp66_ = NULL;
-		gchar* _tmp67_ = NULL;
-#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp66_ = _ ("Videos _visible to:");
-#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp67_ = g_strdup (_tmp66_);
-#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		upload_label_text = _tmp69_;
+#line 5953 "FlickrPublishing.c"
+	}
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp70_ = self->priv->upload_info_label;
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp71_ = upload_label_text;
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	gtk_label_set_label (_tmp70_, _tmp71_);
+#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp72_ = _ ("Photos _visible to:");
+#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp73_ = g_strdup (_tmp72_);
+#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	visibility_label_text = _tmp73_;
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp74_ = media_type;
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (_tmp74_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+#line 5971 "FlickrPublishing.c"
+		const gchar* _tmp75_ = NULL;
+		gchar* _tmp76_ = NULL;
+#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp75_ = _ ("Videos _visible to:");
+#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp76_ = g_strdup (_tmp75_);
+#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (visibility_label_text);
-#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		visibility_label_text = _tmp67_;
-#line 7717 "FlickrPublishing.c"
+#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		visibility_label_text = _tmp76_;
+#line 5982 "FlickrPublishing.c"
 	} else {
-		SpitPublishingPublisherMediaType _tmp68_ = 0;
-#line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp68_ = media_type;
-#line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		if (_tmp68_ == (SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO)) {
-#line 7724 "FlickrPublishing.c"
-			const gchar* _tmp69_ = NULL;
-			gchar* _tmp70_ = NULL;
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_tmp69_ = _ ("Photos and videos _visible to:");
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_tmp70_ = g_strdup (_tmp69_);
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		SpitPublishingPublisherMediaType _tmp77_ = 0;
+#line 812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp77_ = media_type;
+#line 812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		if (_tmp77_ == (SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO)) {
+#line 5989 "FlickrPublishing.c"
+			const gchar* _tmp78_ = NULL;
+			gchar* _tmp79_ = NULL;
+#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			_tmp78_ = _ ("Photos and videos _visible to:");
+#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			_tmp79_ = g_strdup (_tmp78_);
+#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (visibility_label_text);
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			visibility_label_text = _tmp70_;
-#line 7735 "FlickrPublishing.c"
+#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			visibility_label_text = _tmp79_;
+#line 6000 "FlickrPublishing.c"
 		}
 	}
-#line 1146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp71_ = self->priv->visibility_label;
-#line 1146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp72_ = visibility_label_text;
-#line 1146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	gtk_label_set_label (_tmp71_, _tmp72_);
-#line 1148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp80_ = self->priv->visibility_label;
+#line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp81_ = visibility_label_text;
+#line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	gtk_label_set_label (_tmp80_, _tmp81_);
+#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_populate_visibility_combo (self);
-#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp73_ = self->priv->visibility_combo;
-#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_flickr_publishing_options_pane_on_visibility_changed_gtk_combo_box_changed, self, 0);
-#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp74_ = media_type;
-#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp74_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 7754 "FlickrPublishing.c"
-		GtkComboBoxText* _tmp75_ = NULL;
-#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp82_ = self->priv->visibility_combo;
+#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_flickr_publishing_options_pane_on_visibility_changed_gtk_combo_box_changed, self, 0);
+#line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp83_ = media_type;
+#line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (_tmp83_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+#line 6019 "FlickrPublishing.c"
+		GtkComboBoxText* _tmp84_ = NULL;
+#line 823 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_populate_size_combo (self);
-#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp75_ = self->priv->size_combo;
-#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_flickr_publishing_options_pane_on_size_changed_gtk_combo_box_changed, self, 0);
-#line 7762 "FlickrPublishing.c"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp84_ = self->priv->size_combo;
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_flickr_publishing_options_pane_on_size_changed_gtk_combo_box_changed, self, 0);
+#line 6027 "FlickrPublishing.c"
 	} else {
-		GtkComboBoxText* _tmp76_ = NULL;
-		GtkLabel* _tmp77_ = NULL;
-#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp76_ = self->priv->size_combo;
-#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp77_ = self->priv->size_label;
-#line 1157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 7774 "FlickrPublishing.c"
-	}
-#line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp78_ = self->priv->strip_metadata_check;
-#line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp79_ = strip_metadata;
-#line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp79_);
-#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp80_ = self->priv->logout_button;
-#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_connect_object (_tmp80_, "clicked", (GCallback) _publishing_flickr_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
-#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp81_ = self->priv->publish_button;
-#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_connect_object (_tmp81_, "clicked", (GCallback) _publishing_flickr_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
-#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		GtkComboBoxText* _tmp85_ = NULL;
+		GtkLabel* _tmp86_ = NULL;
+#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp85_ = self->priv->size_combo;
+#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp86_ = self->priv->size_label;
+#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 6039 "FlickrPublishing.c"
+	}
+#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp87_ = self->priv->strip_metadata_check;
+#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp88_ = strip_metadata;
+#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp88_);
+#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp89_ = self->priv->logout_button;
+#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_signal_connect_object (_tmp89_, "clicked", (GCallback) _publishing_flickr_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
+#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp90_ = self->priv->publish_button;
+#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_signal_connect_object (_tmp90_, "clicked", (GCallback) _publishing_flickr_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
+#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (visibility_label_text);
-#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (upload_label_text);
-#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 7796 "FlickrPublishing.c"
+#line 6061 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane_new (PublishingFlickrFlickrPublisher* publisher, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublisherMediaType media_type, GtkBuilder* builder, gboolean strip_metadata) {
-#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_publishing_options_pane_construct (PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, publisher, parameters, media_type, builder, strip_metadata);
-#line 7803 "FlickrPublishing.c"
+#line 6068 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_on_logout_clicked (PublishingFlickrPublishingOptionsPane* self) {
-#line 1166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_emit_by_name (self, "logout");
-#line 7812 "FlickrPublishing.c"
+#line 6077 "FlickrPublishing.c"
 }
 
 
 static gpointer _publishing_flickr_visibility_specification_ref0 (gpointer self) {
-#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? publishing_flickr_visibility_specification_ref (self) : NULL;
-#line 7819 "FlickrPublishing.c"
+#line 6084 "FlickrPublishing.c"
 }
 
 
@@ -7875,33 +6117,33 @@ static void publishing_flickr_publishing_options_pane_on_publish_clicked (Publis
 	SpitPublishingPublisherMediaType _tmp7_ = 0;
 	GtkCheckButton* _tmp14_ = NULL;
 	gboolean _tmp15_ = FALSE;
-#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->parameters;
-#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->visibilities;
-#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1__length1 = self->priv->visibilities_length1;
-#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = self->priv->visibility_combo;
-#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = _tmp1_[_tmp3_];
-#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = _tmp4_->specification;
-#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = _publishing_flickr_visibility_specification_ref0 (_tmp5_);
-#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (_tmp0_->visibility_specification);
-#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_->visibility_specification = _tmp6_;
-#line 1174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = self->priv->media_type;
-#line 1174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((_tmp7_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) {
-#line 7861 "FlickrPublishing.c"
+#line 6126 "FlickrPublishing.c"
 		PublishingFlickrPublishingParameters* _tmp8_ = NULL;
 		PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp9_ = NULL;
 		gint _tmp9__length1 = 0;
@@ -7909,116 +6151,116 @@ static void publishing_flickr_publishing_options_pane_on_publish_clicked (Publis
 		gint _tmp11_ = 0;
 		PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp12_ = NULL;
 		gint _tmp13_ = 0;
-#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp8_ = self->priv->parameters;
-#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp9_ = self->priv->sizes;
-#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp9__length1 = self->priv->sizes_length1;
-#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp10_ = self->priv->size_combo;
-#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp11_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp12_ = _tmp9_[_tmp11_];
-#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp13_ = _tmp12_->size;
-#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp8_->photo_major_axis_size = _tmp13_;
-#line 7885 "FlickrPublishing.c"
+#line 6150 "FlickrPublishing.c"
 	}
-#line 1177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14_ = self->priv->strip_metadata_check;
-#line 1177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp15_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_emit_by_name (self, "publish", _tmp15_);
-#line 7893 "FlickrPublishing.c"
+#line 6158 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add20 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
-#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void _vala_array_add21 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
+#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1);
-#line 7904 "FlickrPublishing.c"
+#line 6169 "FlickrPublishing.c"
 	}
-#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 7910 "FlickrPublishing.c"
+#line 6175 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add21 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
-#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void _vala_array_add22 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
+#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1);
-#line 7921 "FlickrPublishing.c"
+#line 6186 "FlickrPublishing.c"
 	}
-#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 7927 "FlickrPublishing.c"
+#line 6192 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add22 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
-#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void _vala_array_add23 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
+#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1);
-#line 7938 "FlickrPublishing.c"
+#line 6203 "FlickrPublishing.c"
 	}
-#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 7944 "FlickrPublishing.c"
+#line 6209 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add23 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void _vala_array_add24 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
+#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1);
-#line 7955 "FlickrPublishing.c"
+#line 6220 "FlickrPublishing.c"
 	}
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 7961 "FlickrPublishing.c"
+#line 6226 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add24 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
-#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void _vala_array_add25 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
+#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1);
-#line 7972 "FlickrPublishing.c"
+#line 6237 "FlickrPublishing.c"
 	}
-#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 7978 "FlickrPublishing.c"
+#line 6243 "FlickrPublishing.c"
 }
 
 
@@ -8060,118 +6302,118 @@ static PublishingFlickrPublishingOptionsPaneVisibilityEntry** publishing_flickr_
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp25_ = NULL;
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp26_ = NULL;
 	gint _tmp26__length1 = 0;
-#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
-#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = g_new0 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, 0 + 1);
-#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_result_ = _tmp0_;
-#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_result__length1 = 0;
-#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	__result__size_ = _result__length1;
-#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = _result_;
-#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1__length1 = _result__length1;
-#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = _ ("Everyone");
-#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = publishing_flickr_visibility_specification_new (1, 1, 1);
-#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = _tmp3_;
-#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_tmp2_, _tmp4_);
-#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add20 (&_result_, &_result__length1, &__result__size_, _tmp5_);
-#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add21 (&_result_, &_result__length1, &__result__size_, _tmp5_);
+#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (_tmp4_);
-#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = _result_;
-#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6__length1 = _result__length1;
-#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = _ ("Friends & family only");
-#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = publishing_flickr_visibility_specification_new (1, 1, 0);
-#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = _tmp8_;
-#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_tmp7_, _tmp9_);
-#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add21 (&_result_, &_result__length1, &__result__size_, _tmp10_);
-#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add22 (&_result_, &_result__length1, &__result__size_, _tmp10_);
+#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (_tmp9_);
-#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp11_ = _result_;
-#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp11__length1 = _result__length1;
-#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp12_ = _ ("Family only");
-#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp13_ = publishing_flickr_visibility_specification_new (0, 1, 0);
-#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14_ = _tmp13_;
-#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp15_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_tmp12_, _tmp14_);
-#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add22 (&_result_, &_result__length1, &__result__size_, _tmp15_);
-#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add23 (&_result_, &_result__length1, &__result__size_, _tmp15_);
+#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (_tmp14_);
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp16_ = _result_;
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp16__length1 = _result__length1;
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp17_ = _ ("Friends only");
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp18_ = publishing_flickr_visibility_specification_new (1, 0, 0);
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp19_ = _tmp18_;
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp20_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_tmp17_, _tmp19_);
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add23 (&_result_, &_result__length1, &__result__size_, _tmp20_);
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add24 (&_result_, &_result__length1, &__result__size_, _tmp20_);
+#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (_tmp19_);
-#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp21_ = _result_;
-#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp21__length1 = _result__length1;
-#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp22_ = _ ("Just me");
-#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp23_ = publishing_flickr_visibility_specification_new (0, 0, 0);
-#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp24_ = _tmp23_;
-#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp25_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_tmp22_, _tmp24_);
-#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add24 (&_result_, &_result__length1, &__result__size_, _tmp25_);
-#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add25 (&_result_, &_result__length1, &__result__size_, _tmp25_);
+#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (_tmp24_);
-#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp26_ = _result_;
-#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp26__length1 = _result__length1;
-#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (result_length1) {
-#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*result_length1 = _tmp26__length1;
-#line 8118 "FlickrPublishing.c"
+#line 6383 "FlickrPublishing.c"
 	}
-#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp26_;
-#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 8124 "FlickrPublishing.c"
+#line 6389 "FlickrPublishing.c"
 }
 
 
 static gpointer _publishing_flickr_publishing_options_pane_visibility_entry_ref0 (gpointer self) {
-#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? publishing_flickr_publishing_options_pane_visibility_entry_ref (self) : NULL;
-#line 8131 "FlickrPublishing.c"
+#line 6396 "FlickrPublishing.c"
 }
 
 
@@ -8183,165 +6425,165 @@ static void publishing_flickr_publishing_options_pane_populate_visibility_combo
 	GtkComboBoxText* _tmp8_ = NULL;
 	PublishingFlickrFlickrPublisher* _tmp9_ = NULL;
 	gint _tmp10_ = 0;
-#line 1192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->visibilities;
-#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0__length1 = self->priv->visibilities_length1;
-#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 8151 "FlickrPublishing.c"
+#line 6416 "FlickrPublishing.c"
 		gint _tmp1_ = 0;
 		PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp2_ = NULL;
-#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp2_ = publishing_flickr_publishing_options_pane_create_visibilities (self, &_tmp1_);
-#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		self->priv->visibilities = (_vala_array_free (self->priv->visibilities, self->priv->visibilities_length1, (GDestroyNotify) publishing_flickr_publishing_options_pane_visibility_entry_unref), NULL);
-#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		self->priv->visibilities = _tmp2_;
-#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		self->priv->visibilities_length1 = _tmp1_;
-#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		self->priv->_visibilities_size_ = self->priv->visibilities_length1;
-#line 8164 "FlickrPublishing.c"
+#line 6429 "FlickrPublishing.c"
 	}
-#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = self->priv->visibilities;
-#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3__length1 = self->priv->visibilities_length1;
-#line 8170 "FlickrPublishing.c"
+#line 6435 "FlickrPublishing.c"
 	{
 		PublishingFlickrPublishingOptionsPaneVisibilityEntry** v_collection = NULL;
 		gint v_collection_length1 = 0;
 		gint _v_collection_size_ = 0;
 		gint v_it = 0;
-#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		v_collection = _tmp3_;
-#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		v_collection_length1 = _tmp3__length1;
-#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		for (v_it = 0; v_it < _tmp3__length1; v_it = v_it + 1) {
-#line 8182 "FlickrPublishing.c"
+#line 6447 "FlickrPublishing.c"
 			PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp4_ = NULL;
 			PublishingFlickrPublishingOptionsPaneVisibilityEntry* v = NULL;
-#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp4_ = _publishing_flickr_publishing_options_pane_visibility_entry_ref0 (v_collection[v_it]);
-#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			v = _tmp4_;
-#line 8189 "FlickrPublishing.c"
+#line 6454 "FlickrPublishing.c"
 			{
 				GtkComboBoxText* _tmp5_ = NULL;
 				PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp6_ = NULL;
 				const gchar* _tmp7_ = NULL;
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp5_ = self->priv->visibility_combo;
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp6_ = v;
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp7_ = _tmp6_->title;
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				gtk_combo_box_text_append_text (_tmp5_, _tmp7_);
-#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_publishing_flickr_publishing_options_pane_visibility_entry_unref0 (v);
-#line 8204 "FlickrPublishing.c"
+#line 6469 "FlickrPublishing.c"
 			}
 		}
 	}
-#line 1199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = self->priv->visibility_combo;
-#line 1199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = self->priv->publisher;
-#line 1199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = publishing_flickr_flickr_publisher_get_persistent_visibility (_tmp9_);
-#line 1199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), _tmp10_);
-#line 8216 "FlickrPublishing.c"
+#line 6481 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add25 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
-#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void _vala_array_add26 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
+#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1);
-#line 8227 "FlickrPublishing.c"
+#line 6492 "FlickrPublishing.c"
 	}
-#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8233 "FlickrPublishing.c"
+#line 6498 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add26 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
-#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void _vala_array_add27 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
+#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1);
-#line 8244 "FlickrPublishing.c"
+#line 6509 "FlickrPublishing.c"
 	}
-#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8250 "FlickrPublishing.c"
+#line 6515 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add27 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void _vala_array_add28 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
+#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1);
-#line 8261 "FlickrPublishing.c"
+#line 6526 "FlickrPublishing.c"
 	}
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8267 "FlickrPublishing.c"
+#line 6532 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add28 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
-#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void _vala_array_add29 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
+#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1);
-#line 8278 "FlickrPublishing.c"
+#line 6543 "FlickrPublishing.c"
 	}
-#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8284 "FlickrPublishing.c"
+#line 6549 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add29 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void _vala_array_add30 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
+#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1);
-#line 8295 "FlickrPublishing.c"
+#line 6560 "FlickrPublishing.c"
 	}
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8301 "FlickrPublishing.c"
+#line 6566 "FlickrPublishing.c"
 }
 
 
@@ -8373,88 +6615,88 @@ static PublishingFlickrPublishingOptionsPaneSizeEntry** publishing_flickr_publis
 	PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp15_ = NULL;
 	PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp16_ = NULL;
 	gint _tmp16__length1 = 0;
-#line 1202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
-#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = g_new0 (PublishingFlickrPublishingOptionsPaneSizeEntry*, 0 + 1);
-#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_result_ = _tmp0_;
-#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_result__length1 = 0;
-#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	__result__size_ = _result__length1;
-#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = _result_;
-#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1__length1 = _result__length1;
-#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = _ ("500 × 375 pixels");
-#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = publishing_flickr_publishing_options_pane_size_entry_new (_tmp2_, 500);
-#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add25 (&_result_, &_result__length1, &__result__size_, _tmp3_);
-#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add26 (&_result_, &_result__length1, &__result__size_, _tmp3_);
+#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = _result_;
-#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4__length1 = _result__length1;
-#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = _ ("1024 × 768 pixels");
-#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = publishing_flickr_publishing_options_pane_size_entry_new (_tmp5_, 1024);
-#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add26 (&_result_, &_result__length1, &__result__size_, _tmp6_);
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add27 (&_result_, &_result__length1, &__result__size_, _tmp6_);
+#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = _result_;
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7__length1 = _result__length1;
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = _ ("2048 × 1536 pixels");
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = publishing_flickr_publishing_options_pane_size_entry_new (_tmp8_, 2048);
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add27 (&_result_, &_result__length1, &__result__size_, _tmp9_);
-#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add28 (&_result_, &_result__length1, &__result__size_, _tmp9_);
+#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = _result_;
-#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10__length1 = _result__length1;
-#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp11_ = _ ("4096 × 3072 pixels");
-#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp12_ = publishing_flickr_publishing_options_pane_size_entry_new (_tmp11_, 4096);
-#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add28 (&_result_, &_result__length1, &__result__size_, _tmp12_);
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add29 (&_result_, &_result__length1, &__result__size_, _tmp12_);
+#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp13_ = _result_;
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp13__length1 = _result__length1;
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14_ = _ ("Original size");
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp15_ = publishing_flickr_publishing_options_pane_size_entry_new (_tmp14_, PUBLISHING_FLICKR_ORIGINAL_SIZE);
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add29 (&_result_, &_result__length1, &__result__size_, _tmp15_);
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add30 (&_result_, &_result__length1, &__result__size_, _tmp15_);
+#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp16_ = _result_;
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp16__length1 = _result__length1;
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (result_length1) {
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*result_length1 = _tmp16__length1;
-#line 8401 "FlickrPublishing.c"
+#line 6666 "FlickrPublishing.c"
 	}
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp16_;
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 8407 "FlickrPublishing.c"
+#line 6672 "FlickrPublishing.c"
 }
 
 
 static gpointer _publishing_flickr_publishing_options_pane_size_entry_ref0 (gpointer self) {
-#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? publishing_flickr_publishing_options_pane_size_entry_ref (self) : NULL;
-#line 8414 "FlickrPublishing.c"
+#line 6679 "FlickrPublishing.c"
 }
 
 
@@ -8466,80 +6708,80 @@ static void publishing_flickr_publishing_options_pane_populate_size_combo (Publi
 	GtkComboBoxText* _tmp8_ = NULL;
 	PublishingFlickrFlickrPublisher* _tmp9_ = NULL;
 	gint _tmp10_ = 0;
-#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->sizes;
-#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0__length1 = self->priv->sizes_length1;
-#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 8434 "FlickrPublishing.c"
+#line 6699 "FlickrPublishing.c"
 		gint _tmp1_ = 0;
 		PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp2_ = NULL;
-#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp2_ = publishing_flickr_publishing_options_pane_create_sizes (self, &_tmp1_);
-#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		self->priv->sizes = (_vala_array_free (self->priv->sizes, self->priv->sizes_length1, (GDestroyNotify) publishing_flickr_publishing_options_pane_size_entry_unref), NULL);
-#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		self->priv->sizes = _tmp2_;
-#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		self->priv->sizes_length1 = _tmp1_;
-#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		self->priv->_sizes_size_ = self->priv->sizes_length1;
-#line 8447 "FlickrPublishing.c"
+#line 6712 "FlickrPublishing.c"
 	}
-#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = self->priv->sizes;
-#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3__length1 = self->priv->sizes_length1;
-#line 8453 "FlickrPublishing.c"
+#line 6718 "FlickrPublishing.c"
 	{
 		PublishingFlickrPublishingOptionsPaneSizeEntry** e_collection = NULL;
 		gint e_collection_length1 = 0;
 		gint _e_collection_size_ = 0;
 		gint e_it = 0;
-#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		e_collection = _tmp3_;
-#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		e_collection_length1 = _tmp3__length1;
-#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		for (e_it = 0; e_it < _tmp3__length1; e_it = e_it + 1) {
-#line 8465 "FlickrPublishing.c"
+#line 6730 "FlickrPublishing.c"
 			PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp4_ = NULL;
 			PublishingFlickrPublishingOptionsPaneSizeEntry* e = NULL;
-#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp4_ = _publishing_flickr_publishing_options_pane_size_entry_ref0 (e_collection[e_it]);
-#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			e = _tmp4_;
-#line 8472 "FlickrPublishing.c"
+#line 6737 "FlickrPublishing.c"
 			{
 				GtkComboBoxText* _tmp5_ = NULL;
 				PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp6_ = NULL;
 				const gchar* _tmp7_ = NULL;
-#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp5_ = self->priv->size_combo;
-#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp6_ = e;
-#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp7_ = _tmp6_->title;
-#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				gtk_combo_box_text_append_text (_tmp5_, _tmp7_);
-#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_publishing_flickr_publishing_options_pane_size_entry_unref0 (e);
-#line 8487 "FlickrPublishing.c"
+#line 6752 "FlickrPublishing.c"
 			}
 		}
 	}
-#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = self->priv->size_combo;
-#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = self->priv->publisher;
-#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = publishing_flickr_flickr_publisher_get_persistent_default_size (_tmp9_);
-#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), _tmp10_);
-#line 8499 "FlickrPublishing.c"
+#line 6764 "FlickrPublishing.c"
 }
 
 
@@ -8547,17 +6789,17 @@ static void publishing_flickr_publishing_options_pane_on_size_changed (Publishin
 	PublishingFlickrFlickrPublisher* _tmp0_ = NULL;
 	GtkComboBoxText* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
-#line 1224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->publisher;
-#line 1225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->size_combo;
-#line 1225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_set_persistent_default_size (_tmp0_, _tmp2_);
-#line 8517 "FlickrPublishing.c"
+#line 6782 "FlickrPublishing.c"
 }
 
 
@@ -8565,41 +6807,41 @@ static void publishing_flickr_publishing_options_pane_on_visibility_changed (Pub
 	PublishingFlickrFlickrPublisher* _tmp0_ = NULL;
 	GtkComboBoxText* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
-#line 1228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->publisher;
-#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->visibility_combo;
-#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_set_persistent_visibility (_tmp0_, _tmp2_);
-#line 8535 "FlickrPublishing.c"
+#line 6800 "FlickrPublishing.c"
 }
 
 
 void publishing_flickr_publishing_options_pane_notify_publish (PublishingFlickrPublishingOptionsPane* self) {
 	GtkCheckButton* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 903 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->strip_metadata_check;
-#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_emit_by_name (self, "publish", _tmp1_);
-#line 8550 "FlickrPublishing.c"
+#line 6815 "FlickrPublishing.c"
 }
 
 
 void publishing_flickr_publishing_options_pane_notify_logout (PublishingFlickrPublishingOptionsPane* self) {
-#line 1236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_emit_by_name (self, "logout");
-#line 8559 "FlickrPublishing.c"
+#line 6824 "FlickrPublishing.c"
 }
 
 
@@ -8608,56 +6850,56 @@ static GtkWidget* publishing_flickr_publishing_options_pane_real_get_widget (Spi
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_ = NULL;
 	GtkWidget* _tmp1_ = NULL;
-#line 1240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane);
-#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->pane_widget;
-#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp1_;
-#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 8578 "FlickrPublishing.c"
+#line 6843 "FlickrPublishing.c"
 }
 
 
 static SpitPublishingDialogPaneGeometryOptions publishing_flickr_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
 	PublishingFlickrPublishingOptionsPane * self;
 	SpitPublishingDialogPaneGeometryOptions result = 0;
-#line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane);
-#line 1245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 1245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 8591 "FlickrPublishing.c"
+#line 6856 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_publishing_options_pane_notify_publish_publishing_flickr_publishing_options_pane_publish (PublishingFlickrPublishingOptionsPane* _sender, gboolean strip_metadata, gpointer self) {
-#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_notify_publish ((PublishingFlickrPublishingOptionsPane*) self);
-#line 8598 "FlickrPublishing.c"
+#line 6863 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_publishing_options_pane_notify_logout_publishing_flickr_publishing_options_pane_logout (PublishingFlickrPublishingOptionsPane* _sender, gpointer self) {
-#line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_notify_logout ((PublishingFlickrPublishingOptionsPane*) self);
-#line 8605 "FlickrPublishing.c"
+#line 6870 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
 	PublishingFlickrPublishingOptionsPane * self;
-#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane);
-#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_connect_object (self, "publish", (GCallback) _publishing_flickr_publishing_options_pane_notify_publish_publishing_flickr_publishing_options_pane_publish, self, 0);
-#line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_connect_object (self, "logout", (GCallback) _publishing_flickr_publishing_options_pane_notify_logout_publishing_flickr_publishing_options_pane_logout, self, 0);
-#line 8617 "FlickrPublishing.c"
+#line 6882 "FlickrPublishing.c"
 }
 
 
@@ -8665,17 +6907,17 @@ static void publishing_flickr_publishing_options_pane_real_on_pane_uninstalled (
 	PublishingFlickrPublishingOptionsPane * self;
 	guint _tmp0_ = 0U;
 	guint _tmp1_ = 0U;
-#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 924 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane);
-#line 1254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("publish", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp0_, NULL, FALSE);
-#line 1254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_flickr_publishing_options_pane_notify_publish_publishing_flickr_publishing_options_pane_publish, self);
-#line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("logout", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE);
-#line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_flickr_publishing_options_pane_notify_logout_publishing_flickr_publishing_options_pane_logout, self);
-#line 8635 "FlickrPublishing.c"
+#line 6900 "FlickrPublishing.c"
 }
 
 
@@ -8684,240 +6926,240 @@ static PublishingFlickrPublishingOptionsPaneSizeEntry* publishing_flickr_publish
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
-#line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (creator_title != NULL, NULL);
-#line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrPublishingOptionsPaneSizeEntry*) g_type_create_instance (object_type);
-#line 1071 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = creator_title;
-#line 1071 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1071 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->title);
-#line 1071 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->title = _tmp1_;
-#line 1072 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = creator_size;
-#line 1072 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->size = _tmp2_;
-#line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 8662 "FlickrPublishing.c"
+#line 6927 "FlickrPublishing.c"
 }
 
 
 static PublishingFlickrPublishingOptionsPaneSizeEntry* publishing_flickr_publishing_options_pane_size_entry_new (const gchar* creator_title, gint creator_size) {
-#line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_publishing_options_pane_size_entry_construct (PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY, creator_title, creator_size);
-#line 8669 "FlickrPublishing.c"
+#line 6934 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_size_entry_init (GValue* value) {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 8676 "FlickrPublishing.c"
+#line 6941 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_size_entry_free_value (GValue* value) {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_size_entry_unref (value->data[0].v_pointer);
-#line 8685 "FlickrPublishing.c"
+#line 6950 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_size_entry_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_flickr_publishing_options_pane_size_entry_ref (src_value->data[0].v_pointer);
-#line 8695 "FlickrPublishing.c"
+#line 6960 "FlickrPublishing.c"
 	} else {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 8699 "FlickrPublishing.c"
+#line 6964 "FlickrPublishing.c"
 	}
 }
 
 
 static gpointer publishing_flickr_publishing_options_pane_value_size_entry_peek_pointer (const GValue* value) {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 8707 "FlickrPublishing.c"
+#line 6972 "FlickrPublishing.c"
 }
 
 
 static gchar* publishing_flickr_publishing_options_pane_value_size_entry_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 8714 "FlickrPublishing.c"
+#line 6979 "FlickrPublishing.c"
 		PublishingFlickrPublishingOptionsPaneSizeEntry* object;
 		object = collect_values[0].v_pointer;
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8721 "FlickrPublishing.c"
+#line 6986 "FlickrPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 8725 "FlickrPublishing.c"
+#line 6990 "FlickrPublishing.c"
 		}
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = publishing_flickr_publishing_options_pane_size_entry_ref (object);
-#line 8729 "FlickrPublishing.c"
+#line 6994 "FlickrPublishing.c"
 	} else {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8733 "FlickrPublishing.c"
+#line 6998 "FlickrPublishing.c"
 	}
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 8737 "FlickrPublishing.c"
+#line 7002 "FlickrPublishing.c"
 }
 
 
 static gchar* publishing_flickr_publishing_options_pane_value_size_entry_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingFlickrPublishingOptionsPaneSizeEntry** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!object_p) {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 8748 "FlickrPublishing.c"
+#line 7013 "FlickrPublishing.c"
 	}
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = NULL;
-#line 8754 "FlickrPublishing.c"
+#line 7019 "FlickrPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 8758 "FlickrPublishing.c"
+#line 7023 "FlickrPublishing.c"
 	} else {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = publishing_flickr_publishing_options_pane_size_entry_ref (value->data[0].v_pointer);
-#line 8762 "FlickrPublishing.c"
+#line 7027 "FlickrPublishing.c"
 	}
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 8766 "FlickrPublishing.c"
+#line 7031 "FlickrPublishing.c"
 }
 
 
 static GParamSpec* publishing_flickr_publishing_options_pane_param_spec_size_entry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingFlickrPublishingOptionsPaneParamSpecSizeEntry* spec;
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY), NULL);
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 8780 "FlickrPublishing.c"
+#line 7045 "FlickrPublishing.c"
 }
 
 
 static gpointer publishing_flickr_publishing_options_pane_value_get_size_entry (const GValue* value) {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY), NULL);
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 8789 "FlickrPublishing.c"
+#line 7054 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_set_size_entry (GValue* value, gpointer v_object) {
 	PublishingFlickrPublishingOptionsPaneSizeEntry* old;
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY));
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (v_object) {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY));
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_size_entry_ref (value->data[0].v_pointer);
-#line 8809 "FlickrPublishing.c"
+#line 7074 "FlickrPublishing.c"
 	} else {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8813 "FlickrPublishing.c"
+#line 7078 "FlickrPublishing.c"
 	}
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_size_entry_unref (old);
-#line 8819 "FlickrPublishing.c"
+#line 7084 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_take_size_entry (GValue* value, gpointer v_object) {
 	PublishingFlickrPublishingOptionsPaneSizeEntry* old;
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY));
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (v_object) {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY));
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 8838 "FlickrPublishing.c"
+#line 7103 "FlickrPublishing.c"
 	} else {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8842 "FlickrPublishing.c"
+#line 7107 "FlickrPublishing.c"
 	}
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_size_entry_unref (old);
-#line 8848 "FlickrPublishing.c"
+#line 7113 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_publishing_options_pane_size_entry_class_init (PublishingFlickrPublishingOptionsPaneSizeEntryClass * klass) {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_size_entry_parent_class = g_type_class_peek_parent (klass);
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingFlickrPublishingOptionsPaneSizeEntryClass *) klass)->finalize = publishing_flickr_publishing_options_pane_size_entry_finalize;
-#line 8858 "FlickrPublishing.c"
+#line 7123 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_size_entry_instance_init (PublishingFlickrPublishingOptionsPaneSizeEntry * self) {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->ref_count = 1;
-#line 8865 "FlickrPublishing.c"
+#line 7130 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_size_entry_finalize (PublishingFlickrPublishingOptionsPaneSizeEntry* obj) {
 	PublishingFlickrPublishingOptionsPaneSizeEntry * self;
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY, PublishingFlickrPublishingOptionsPaneSizeEntry);
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->title);
-#line 8877 "FlickrPublishing.c"
+#line 7142 "FlickrPublishing.c"
 }
 
 
@@ -8938,24 +7180,24 @@ static GType publishing_flickr_publishing_options_pane_size_entry_get_type (void
 static gpointer publishing_flickr_publishing_options_pane_size_entry_ref (gpointer instance) {
 	PublishingFlickrPublishingOptionsPaneSizeEntry* self;
 	self = instance;
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return instance;
-#line 8902 "FlickrPublishing.c"
+#line 7167 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_size_entry_unref (gpointer instance) {
 	PublishingFlickrPublishingOptionsPaneSizeEntry* self;
 	self = instance;
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_SIZE_ENTRY_GET_CLASS (self)->finalize (self);
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 8915 "FlickrPublishing.c"
+#line 7180 "FlickrPublishing.c"
 	}
 }
 
@@ -8966,248 +7208,248 @@ static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_p
 	PublishingFlickrVisibilitySpecification* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (creator_title != NULL, NULL);
-#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_VISIBILITY_SPECIFICATION (creator_specification), NULL);
-#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrPublishingOptionsPaneVisibilityEntry*) g_type_create_instance (object_type);
-#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = creator_specification;
-#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = _publishing_flickr_visibility_specification_ref0 (_tmp0_);
-#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (self->specification);
-#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->specification = _tmp1_;
-#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = creator_title;
-#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->title);
-#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->title = _tmp3_;
-#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 8950 "FlickrPublishing.c"
+#line 7215 "FlickrPublishing.c"
 }
 
 
 static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_publishing_options_pane_visibility_entry_new (const gchar* creator_title, PublishingFlickrVisibilitySpecification* creator_specification) {
-#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_publishing_options_pane_visibility_entry_construct (PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY, creator_title, creator_specification);
-#line 8957 "FlickrPublishing.c"
+#line 7222 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_visibility_entry_init (GValue* value) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 8964 "FlickrPublishing.c"
+#line 7229 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_visibility_entry_free_value (GValue* value) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_visibility_entry_unref (value->data[0].v_pointer);
-#line 8973 "FlickrPublishing.c"
+#line 7238 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_visibility_entry_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_flickr_publishing_options_pane_visibility_entry_ref (src_value->data[0].v_pointer);
-#line 8983 "FlickrPublishing.c"
+#line 7248 "FlickrPublishing.c"
 	} else {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 8987 "FlickrPublishing.c"
+#line 7252 "FlickrPublishing.c"
 	}
 }
 
 
 static gpointer publishing_flickr_publishing_options_pane_value_visibility_entry_peek_pointer (const GValue* value) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 8995 "FlickrPublishing.c"
+#line 7260 "FlickrPublishing.c"
 }
 
 
 static gchar* publishing_flickr_publishing_options_pane_value_visibility_entry_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 9002 "FlickrPublishing.c"
+#line 7267 "FlickrPublishing.c"
 		PublishingFlickrPublishingOptionsPaneVisibilityEntry* object;
 		object = collect_values[0].v_pointer;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9009 "FlickrPublishing.c"
+#line 7274 "FlickrPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 9013 "FlickrPublishing.c"
+#line 7278 "FlickrPublishing.c"
 		}
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = publishing_flickr_publishing_options_pane_visibility_entry_ref (object);
-#line 9017 "FlickrPublishing.c"
+#line 7282 "FlickrPublishing.c"
 	} else {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 9021 "FlickrPublishing.c"
+#line 7286 "FlickrPublishing.c"
 	}
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 9025 "FlickrPublishing.c"
+#line 7290 "FlickrPublishing.c"
 }
 
 
 static gchar* publishing_flickr_publishing_options_pane_value_visibility_entry_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!object_p) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 9036 "FlickrPublishing.c"
+#line 7301 "FlickrPublishing.c"
 	}
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = NULL;
-#line 9042 "FlickrPublishing.c"
+#line 7307 "FlickrPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 9046 "FlickrPublishing.c"
+#line 7311 "FlickrPublishing.c"
 	} else {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = publishing_flickr_publishing_options_pane_visibility_entry_ref (value->data[0].v_pointer);
-#line 9050 "FlickrPublishing.c"
+#line 7315 "FlickrPublishing.c"
 	}
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 9054 "FlickrPublishing.c"
+#line 7319 "FlickrPublishing.c"
 }
 
 
 static GParamSpec* publishing_flickr_publishing_options_pane_param_spec_visibility_entry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingFlickrPublishingOptionsPaneParamSpecVisibilityEntry* spec;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY), NULL);
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 9068 "FlickrPublishing.c"
+#line 7333 "FlickrPublishing.c"
 }
 
 
 static gpointer publishing_flickr_publishing_options_pane_value_get_visibility_entry (const GValue* value) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY), NULL);
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 9077 "FlickrPublishing.c"
+#line 7342 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_set_visibility_entry (GValue* value, gpointer v_object) {
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry* old;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY));
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (v_object) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY));
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_visibility_entry_ref (value->data[0].v_pointer);
-#line 9097 "FlickrPublishing.c"
+#line 7362 "FlickrPublishing.c"
 	} else {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 9101 "FlickrPublishing.c"
+#line 7366 "FlickrPublishing.c"
 	}
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_visibility_entry_unref (old);
-#line 9107 "FlickrPublishing.c"
+#line 7372 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_take_visibility_entry (GValue* value, gpointer v_object) {
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry* old;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY));
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (v_object) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY));
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 9126 "FlickrPublishing.c"
+#line 7391 "FlickrPublishing.c"
 	} else {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 9130 "FlickrPublishing.c"
+#line 7395 "FlickrPublishing.c"
 	}
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_visibility_entry_unref (old);
-#line 9136 "FlickrPublishing.c"
+#line 7401 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_publishing_options_pane_visibility_entry_class_init (PublishingFlickrPublishingOptionsPaneVisibilityEntryClass * klass) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_visibility_entry_parent_class = g_type_class_peek_parent (klass);
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingFlickrPublishingOptionsPaneVisibilityEntryClass *) klass)->finalize = publishing_flickr_publishing_options_pane_visibility_entry_finalize;
-#line 9146 "FlickrPublishing.c"
+#line 7411 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_visibility_entry_instance_init (PublishingFlickrPublishingOptionsPaneVisibilityEntry * self) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->ref_count = 1;
-#line 9153 "FlickrPublishing.c"
+#line 7418 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_visibility_entry_finalize (PublishingFlickrPublishingOptionsPaneVisibilityEntry* obj) {
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry * self;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY, PublishingFlickrPublishingOptionsPaneVisibilityEntry);
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (self->specification);
-#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->title);
-#line 9167 "FlickrPublishing.c"
+#line 7432 "FlickrPublishing.c"
 }
 
 
@@ -9228,134 +7470,134 @@ static GType publishing_flickr_publishing_options_pane_visibility_entry_get_type
 static gpointer publishing_flickr_publishing_options_pane_visibility_entry_ref (gpointer instance) {
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry* self;
 	self = instance;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return instance;
-#line 9192 "FlickrPublishing.c"
+#line 7457 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_visibility_entry_unref (gpointer instance) {
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry* self;
 	self = instance;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_VISIBILITY_ENTRY_GET_CLASS (self)->finalize (self);
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 9205 "FlickrPublishing.c"
+#line 7470 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_publishing_options_pane_class_init (PublishingFlickrPublishingOptionsPaneClass * klass) {
-#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_parent_class = g_type_class_peek_parent (klass);
-#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFlickrPublishingOptionsPanePrivate));
-#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_flickr_publishing_options_pane_finalize;
-#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_new ("publish", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_new ("logout", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 9221 "FlickrPublishing.c"
+#line 7486 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
-#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
-#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_flickr_publishing_options_pane_real_get_widget;
-#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_flickr_publishing_options_pane_real_get_preferred_geometry;
-#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_flickr_publishing_options_pane_real_on_pane_installed;
-#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_flickr_publishing_options_pane_real_on_pane_uninstalled;
-#line 9236 "FlickrPublishing.c"
+#line 7501 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_instance_init (PublishingFlickrPublishingOptionsPane * self) {
-#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv = PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
-#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->pane_widget = NULL;
-#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->visibility_label = NULL;
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->upload_info_label = NULL;
-#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->size_label = NULL;
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->logout_button = NULL;
-#line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->publish_button = NULL;
-#line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->visibility_combo = NULL;
-#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->size_combo = NULL;
-#line 1095 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->strip_metadata_check = NULL;
-#line 1096 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->visibilities = NULL;
-#line 1096 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->visibilities_length1 = 0;
-#line 1096 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->_visibilities_size_ = self->priv->visibilities_length1;
-#line 1097 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->sizes = NULL;
-#line 1097 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->sizes_length1 = 0;
-#line 1097 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->_sizes_size_ = self->priv->sizes_length1;
-#line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->parameters = NULL;
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->publisher = NULL;
-#line 9277 "FlickrPublishing.c"
+#line 7542 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_finalize (GObject* obj) {
 	PublishingFlickrPublishingOptionsPane * self;
-#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane);
-#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->pane_widget);
-#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->visibility_label);
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->upload_info_label);
-#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->size_label);
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->logout_button);
-#line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->publish_button);
-#line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->visibility_combo);
-#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->size_combo);
-#line 1095 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->strip_metadata_check);
-#line 1096 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->visibilities = (_vala_array_free (self->priv->visibilities, self->priv->visibilities_length1, (GDestroyNotify) publishing_flickr_publishing_options_pane_visibility_entry_unref), NULL);
-#line 1097 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->sizes = (_vala_array_free (self->priv->sizes, self->priv->sizes_length1, (GDestroyNotify) publishing_flickr_publishing_options_pane_size_entry_unref), NULL);
-#line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->publisher);
-#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_OBJECT_CLASS (publishing_flickr_publishing_options_pane_parent_class)->finalize (obj);
-#line 9315 "FlickrPublishing.c"
+#line 7580 "FlickrPublishing.c"
 }
 
 
@@ -9381,57 +7623,57 @@ PublishingFlickrUploader* publishing_flickr_uploader_construct (GType object_typ
 	PublishingFlickrPublishingParameters* _tmp2_ = NULL;
 	PublishingFlickrPublishingParameters* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL);
-#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_PARAMETERS (parameters), NULL);
-#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = session;
-#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = publishables;
-#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1__length1 = publishables_length1;
-#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp1__length1);
-#line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = parameters;
-#line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = _publishing_flickr_publishing_parameters_ref0 (_tmp2_);
-#line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
-#line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->parameters = _tmp3_;
-#line 1268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = strip_metadata;
-#line 1268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->strip_metadata = _tmp4_;
-#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 9367 "FlickrPublishing.c"
+#line 7632 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrUploader* publishing_flickr_uploader_new (PublishingFlickrSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingFlickrPublishingParameters* parameters, gboolean strip_metadata) {
-#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_uploader_construct (PUBLISHING_FLICKR_TYPE_UPLOADER, session, publishables, publishables_length1, parameters, strip_metadata);
-#line 9374 "FlickrPublishing.c"
+#line 7639 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add30 (gchar*** array, int* length, int* size, gchar* value) {
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void _vala_array_add31 (gchar*** array, int* length, int* size, gchar* value) {
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 9385 "FlickrPublishing.c"
+#line 7650 "FlickrPublishing.c"
 	}
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 9391 "FlickrPublishing.c"
+#line 7656 "FlickrPublishing.c"
 }
 
 
@@ -9449,25 +7691,25 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 	GExiv2Metadata* _tmp32_ = NULL;
 	gboolean _tmp33_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_UPLOADER (self));
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable));
-#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = publishable;
-#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = spit_publishing_publishable_get_media_type (_tmp0_);
-#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp1_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
-#line 1273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 9421 "FlickrPublishing.c"
+#line 7686 "FlickrPublishing.c"
 	}
-#line 1275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = gexiv2_metadata_new ();
-#line 1275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishable_metadata = _tmp2_;
-#line 9427 "FlickrPublishing.c"
+#line 7692 "FlickrPublishing.c"
 	{
 		GExiv2Metadata* _tmp3_ = NULL;
 		SpitPublishingPublishable* _tmp4_ = NULL;
@@ -9475,32 +7717,32 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 		GFile* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
-#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp3_ = publishable_metadata;
-#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp4_ = publishable;
-#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp5_ = spit_publishing_publishable_get_serialized_file (_tmp4_);
-#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp6_ = _tmp5_;
-#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp7_ = g_file_get_path (_tmp6_);
-#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp8_ = _tmp7_;
-#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		gexiv2_metadata_open_path (_tmp3_, _tmp8_, &_inner_error_);
-#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp8_);
-#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_object_unref0 (_tmp6_);
-#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9455 "FlickrPublishing.c"
-			goto __catch25_g_error;
+#line 7720 "FlickrPublishing.c"
+			goto __catch18_g_error;
 		}
 	}
-	goto __finally25;
-	__catch25_g_error:
+	goto __finally18;
+	__catch18_g_error:
 	{
 		GError* err = NULL;
 		SpitPublishingPublishable* _tmp9_ = NULL;
@@ -9508,129 +7750,129 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 		GFile* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
 		gchar* _tmp13_ = NULL;
-#line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		err = _inner_error_;
-#line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_inner_error_ = NULL;
-#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp9_ = publishable;
-#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp10_ = spit_publishing_publishable_get_serialized_file (_tmp9_);
-#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp11_ = _tmp10_;
-#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp12_ = g_file_get_path (_tmp11_);
-#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp13_ = _tmp12_;
-#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_warning ("FlickrPublishing.vala:1279: couldn't read metadata from file '%s' for " \
-"upload preprocessing.", _tmp13_);
-#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		g_warning ("FlickrPublishing.vala:950: couldn't read metadata from file '%s' for u" \
+"pload preprocessing.", _tmp13_);
+#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp13_);
-#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_object_unref0 (_tmp11_);
-#line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (err);
-#line 9490 "FlickrPublishing.c"
+#line 7755 "FlickrPublishing.c"
 	}
-	__finally25:
-#line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	__finally18:
+#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_object_unref0 (publishable_metadata);
-#line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 9503 "FlickrPublishing.c"
+#line 7768 "FlickrPublishing.c"
 	}
-#line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14_ = publishable_metadata;
-#line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp15_ = gexiv2_metadata_has_iptc (_tmp14_);
-#line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!_tmp15_) {
-#line 1288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_object_unref0 (publishable_metadata);
-#line 1288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 9515 "FlickrPublishing.c"
+#line 7780 "FlickrPublishing.c"
 	}
-#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp16_ = publishable_metadata;
-#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp17_ = gexiv2_metadata_has_tag (_tmp16_, "Iptc.Application2.Caption");
-#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp17_) {
-#line 9523 "FlickrPublishing.c"
+#line 7788 "FlickrPublishing.c"
 		GExiv2Metadata* _tmp18_ = NULL;
 		GExiv2Metadata* _tmp19_ = NULL;
 		gchar* _tmp20_ = NULL;
 		gchar* _tmp21_ = NULL;
 		gchar* _tmp22_ = NULL;
 		gchar* _tmp23_ = NULL;
-#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp18_ = publishable_metadata;
-#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp19_ = publishable_metadata;
-#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp20_ = gexiv2_metadata_get_tag_string (_tmp19_, "Iptc.Application2.Caption");
-#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp21_ = _tmp20_;
-#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp22_ = publishing_rest_support_asciify_string (_tmp21_);
-#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp23_ = _tmp22_;
-#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		gexiv2_metadata_set_tag_string (_tmp18_, "Iptc.Application2.Caption", _tmp23_);
-#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp23_);
-#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp21_);
-#line 9548 "FlickrPublishing.c"
+#line 7813 "FlickrPublishing.c"
 	}
-#line 1295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp24_ = publishable_metadata;
-#line 1295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp25_ = gexiv2_metadata_has_tag (_tmp24_, "Iptc.Application2.Headline");
-#line 1295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp25_) {
-#line 9556 "FlickrPublishing.c"
+#line 7821 "FlickrPublishing.c"
 		GExiv2Metadata* _tmp26_ = NULL;
 		GExiv2Metadata* _tmp27_ = NULL;
 		gchar* _tmp28_ = NULL;
 		gchar* _tmp29_ = NULL;
 		gchar* _tmp30_ = NULL;
 		gchar* _tmp31_ = NULL;
-#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp26_ = publishable_metadata;
-#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp27_ = publishable_metadata;
-#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp28_ = gexiv2_metadata_get_tag_string (_tmp27_, "Iptc.Application2.Headline");
-#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp29_ = _tmp28_;
-#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp30_ = publishing_rest_support_asciify_string (_tmp29_);
-#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp31_ = _tmp30_;
-#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		gexiv2_metadata_set_tag_string (_tmp26_, "Iptc.Application2.Headline", _tmp31_);
-#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp31_);
-#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp29_);
-#line 9581 "FlickrPublishing.c"
+#line 7846 "FlickrPublishing.c"
 	}
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp32_ = publishable_metadata;
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp33_ = gexiv2_metadata_has_tag (_tmp32_, "Iptc.Application2.Keywords");
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp33_) {
-#line 9589 "FlickrPublishing.c"
+#line 7854 "FlickrPublishing.c"
 		GeeSet* keyword_set = NULL;
 		GeeHashSet* _tmp34_ = NULL;
 		gchar** iptc_keywords = NULL;
@@ -9670,179 +7912,179 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 		GExiv2Metadata* _tmp60_ = NULL;
 		gchar** _tmp61_ = NULL;
 		gint _tmp61__length1 = 0;
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp34_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		keyword_set = G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_SET, GeeSet);
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp35_ = publishable_metadata;
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp37_ = _tmp36_ = gexiv2_metadata_get_tag_multiple (_tmp35_, "Iptc.Application2.Keywords");
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		iptc_keywords = _tmp37_;
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		iptc_keywords_length1 = _vala_array_length (_tmp36_);
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_iptc_keywords_size_ = iptc_keywords_length1;
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp38_ = iptc_keywords;
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp38__length1 = iptc_keywords_length1;
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (_tmp38_ != NULL) {
-#line 9649 "FlickrPublishing.c"
+#line 7914 "FlickrPublishing.c"
 			gchar** _tmp39_ = NULL;
 			gint _tmp39__length1 = 0;
-#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp39_ = iptc_keywords;
-#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp39__length1 = iptc_keywords_length1;
-#line 9656 "FlickrPublishing.c"
+#line 7921 "FlickrPublishing.c"
 			{
 				gchar** keyword_collection = NULL;
 				gint keyword_collection_length1 = 0;
 				gint _keyword_collection_size_ = 0;
 				gint keyword_it = 0;
-#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				keyword_collection = _tmp39_;
-#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				keyword_collection_length1 = _tmp39__length1;
-#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				for (keyword_it = 0; keyword_it < _tmp39__length1; keyword_it = keyword_it + 1) {
-#line 9668 "FlickrPublishing.c"
+#line 7933 "FlickrPublishing.c"
 					gchar* _tmp40_ = NULL;
 					gchar* keyword = NULL;
-#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp40_ = g_strdup (keyword_collection[keyword_it]);
-#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					keyword = _tmp40_;
-#line 9675 "FlickrPublishing.c"
+#line 7940 "FlickrPublishing.c"
 					{
 						GeeSet* _tmp41_ = NULL;
 						const gchar* _tmp42_ = NULL;
-#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 						_tmp41_ = keyword_set;
-#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 						_tmp42_ = keyword;
-#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 						gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_COLLECTION, GeeCollection), _tmp42_);
-#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 						_g_free0 (keyword);
-#line 9687 "FlickrPublishing.c"
+#line 7952 "FlickrPublishing.c"
 					}
 				}
 			}
 		}
-#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp43_ = publishable_metadata;
-#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp45_ = _tmp44_ = gexiv2_metadata_get_tag_multiple (_tmp43_, "Xmp.dc.subject");
-#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		xmp_keywords = _tmp45_;
-#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		xmp_keywords_length1 = _vala_array_length (_tmp44_);
-#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_xmp_keywords_size_ = xmp_keywords_length1;
-#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp46_ = xmp_keywords;
-#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp46__length1 = xmp_keywords_length1;
-#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (_tmp46_ != NULL) {
-#line 9708 "FlickrPublishing.c"
+#line 7973 "FlickrPublishing.c"
 			gchar** _tmp47_ = NULL;
 			gint _tmp47__length1 = 0;
-#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp47_ = xmp_keywords;
-#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp47__length1 = xmp_keywords_length1;
-#line 9715 "FlickrPublishing.c"
+#line 7980 "FlickrPublishing.c"
 			{
 				gchar** keyword_collection = NULL;
 				gint keyword_collection_length1 = 0;
 				gint _keyword_collection_size_ = 0;
 				gint keyword_it = 0;
-#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				keyword_collection = _tmp47_;
-#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				keyword_collection_length1 = _tmp47__length1;
-#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				for (keyword_it = 0; keyword_it < _tmp47__length1; keyword_it = keyword_it + 1) {
-#line 9727 "FlickrPublishing.c"
+#line 7992 "FlickrPublishing.c"
 					gchar* _tmp48_ = NULL;
 					gchar* keyword = NULL;
-#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp48_ = g_strdup (keyword_collection[keyword_it]);
-#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					keyword = _tmp48_;
-#line 9734 "FlickrPublishing.c"
+#line 7999 "FlickrPublishing.c"
 					{
 						GeeSet* _tmp49_ = NULL;
 						const gchar* _tmp50_ = NULL;
-#line 1310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 						_tmp49_ = keyword_set;
-#line 1310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 						_tmp50_ = keyword;
-#line 1310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 						gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_COLLECTION, GeeCollection), _tmp50_);
-#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 						_g_free0 (keyword);
-#line 9746 "FlickrPublishing.c"
+#line 8011 "FlickrPublishing.c"
 					}
 				}
 			}
 		}
-#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 983 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp51_ = keyword_set;
-#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 983 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp53_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_COLLECTION, GeeCollection), &_tmp52_);
-#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 983 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		all_keywords = _tmp53_;
-#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 983 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		all_keywords_length1 = _tmp52_;
-#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 983 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_all_keywords_size_ = all_keywords_length1;
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp54_ = all_keywords;
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp54__length1 = all_keywords_length1;
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_vala_array_add30 (&all_keywords, &all_keywords_length1, &_all_keywords_size_, NULL);
-#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_vala_array_add31 (&all_keywords, &all_keywords_length1, &_all_keywords_size_, NULL);
+#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp55_ = g_new0 (gchar*, 1 + 1);
-#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		no_keywords = _tmp55_;
-#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		no_keywords_length1 = 1;
-#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_no_keywords_size_ = no_keywords_length1;
-#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp56_ = no_keywords;
-#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp56__length1 = no_keywords_length1;
-#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp56_[0]);
-#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp56_[0] = NULL;
-#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp57_ = _tmp56_[0];
-#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp58_ = publishable_metadata;
-#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp59_ = all_keywords;
-#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp59__length1 = all_keywords_length1;
-#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		gexiv2_metadata_set_tag_multiple (_tmp58_, "Xmp.dc.subject", _tmp59_);
-#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp60_ = publishable_metadata;
-#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp61_ = no_keywords;
-#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp61__length1 = no_keywords_length1;
-#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		gexiv2_metadata_set_tag_multiple (_tmp60_, "Iptc.Application2.Keywords", _tmp61_);
-#line 9801 "FlickrPublishing.c"
+#line 8066 "FlickrPublishing.c"
 		{
 			GExiv2Metadata* _tmp62_ = NULL;
 			SpitPublishingPublishable* _tmp63_ = NULL;
@@ -9850,32 +8092,32 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 			GFile* _tmp65_ = NULL;
 			gchar* _tmp66_ = NULL;
 			gchar* _tmp67_ = NULL;
-#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp62_ = publishable_metadata;
-#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp63_ = publishable;
-#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp64_ = spit_publishing_publishable_get_serialized_file (_tmp63_);
-#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp65_ = _tmp64_;
-#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp66_ = g_file_get_path (_tmp65_);
-#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp67_ = _tmp66_;
-#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			gexiv2_metadata_save_file (_tmp62_, _tmp67_, &_inner_error_);
-#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (_tmp67_);
-#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_object_unref0 (_tmp65_);
-#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9829 "FlickrPublishing.c"
-				goto __catch26_g_error;
+#line 8094 "FlickrPublishing.c"
+				goto __catch19_g_error;
 			}
 		}
-		goto __finally26;
-		__catch26_g_error:
+		goto __finally19;
+		__catch19_g_error:
 		{
 			GError* err = NULL;
 			SpitPublishingPublishable* _tmp68_ = NULL;
@@ -9883,69 +8125,69 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 			GFile* _tmp70_ = NULL;
 			gchar* _tmp71_ = NULL;
 			gchar* _tmp72_ = NULL;
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			err = _inner_error_;
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_inner_error_ = NULL;
-#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp68_ = publishable;
-#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp69_ = spit_publishing_publishable_get_serialized_file (_tmp68_);
-#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp70_ = _tmp69_;
-#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp71_ = g_file_get_path (_tmp70_);
-#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp72_ = _tmp71_;
-#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			g_warning ("FlickrPublishing.vala:1332: couldn't write metadata to file '%s' for u" \
+#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			g_warning ("FlickrPublishing.vala:1003: couldn't write metadata to file '%s' for u" \
 "pload preprocessing.", _tmp72_);
-#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (_tmp72_);
-#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_object_unref0 (_tmp70_);
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_error_free0 (err);
-#line 9864 "FlickrPublishing.c"
+#line 8129 "FlickrPublishing.c"
 		}
-		__finally26:
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		__finally19:
+#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			no_keywords = (_vala_array_free (no_keywords, no_keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			all_keywords = (_vala_array_free (all_keywords, all_keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			xmp_keywords = (_vala_array_free (xmp_keywords, xmp_keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			iptc_keywords = (_vala_array_free (iptc_keywords, iptc_keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_object_unref0 (keyword_set);
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_object_unref0 (publishable_metadata);
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 9887 "FlickrPublishing.c"
+#line 8152 "FlickrPublishing.c"
 		}
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		no_keywords = (_vala_array_free (no_keywords, no_keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		all_keywords = (_vala_array_free (all_keywords, all_keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		xmp_keywords = (_vala_array_free (xmp_keywords, xmp_keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		iptc_keywords = (_vala_array_free (iptc_keywords, iptc_keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_object_unref0 (keyword_set);
-#line 9899 "FlickrPublishing.c"
+#line 8164 "FlickrPublishing.c"
 	}
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (publishable_metadata);
-#line 9903 "FlickrPublishing.c"
+#line 8168 "FlickrPublishing.c"
 }
 
 
@@ -9961,73 +8203,73 @@ static PublishingRESTSupportTransaction* publishing_flickr_uploader_real_create_
 	SpitPublishingPublishable* _tmp6_ = NULL;
 	PublishingFlickrUploadTransaction* _tmp7_ = NULL;
 	PublishingRESTSupportTransaction* _tmp8_ = NULL;
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_UPLOADER, PublishingFlickrUploader);
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = publishing_rest_support_batch_uploader_get_current_publishable (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = _tmp0_;
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_uploader_preprocess_publishable (self, _tmp1_);
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = publishing_rest_support_batch_uploader_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSession);
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = self->priv->parameters;
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = publishing_rest_support_batch_uploader_get_current_publishable (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = _tmp5_;
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = publishing_flickr_upload_transaction_new (_tmp3_, _tmp4_, _tmp6_);
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (_tmp6_);
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_rest_support_session_unref0 (_tmp3_);
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp8_;
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 9953 "FlickrPublishing.c"
+#line 8218 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_uploader_class_init (PublishingFlickrUploaderClass * klass) {
-#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_uploader_parent_class = g_type_class_peek_parent (klass);
-#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->finalize = publishing_flickr_uploader_finalize;
-#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFlickrUploaderPrivate));
-#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = publishing_flickr_uploader_real_create_transaction;
-#line 9966 "FlickrPublishing.c"
+#line 8231 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_uploader_instance_init (PublishingFlickrUploader * self) {
-#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv = PUBLISHING_FLICKR_UPLOADER_GET_PRIVATE (self);
-#line 9973 "FlickrPublishing.c"
+#line 8238 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_uploader_finalize (PublishingRESTSupportBatchUploader* obj) {
 	PublishingFlickrUploader * self;
-#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_UPLOADER, PublishingFlickrUploader);
-#line 1260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
-#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_flickr_uploader_parent_class)->finalize (obj);
-#line 9985 "FlickrPublishing.c"
+#line 8250 "FlickrPublishing.c"
 }
 
 
diff --git a/plugins/shotwell-publishing/FlickrPublishing.vala b/plugins/shotwell-publishing/FlickrPublishing.vala
index 1702288..24b2b61 100644
--- a/plugins/shotwell-publishing/FlickrPublishing.vala
+++ b/plugins/shotwell-publishing/FlickrPublishing.vala
@@ -56,13 +56,7 @@ public class FlickrService : Object, Spit.Pluggable, Spit.Publishing.Service {
 namespace Publishing.Flickr {
 
 internal const string SERVICE_NAME = "Flickr";
-internal const string SERVICE_WELCOME_MESSAGE = 
-    _("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";
-internal const string API_KEY = "60dd96d4a2ad04888b09c9e18d82c26f";
-internal const string API_SECRET = "d0960565e03547c1";
 internal const int ORIGINAL_SIZE = -1;
 internal const string EXPIRED_SESSION_ERROR_CODE = "98";
 internal const string ENCODE_RFC_3986_EXTRA = "!*'();:@&=+$,/?%#[] \\";
@@ -104,168 +98,63 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object {
     private bool was_started = false;
     private Session session = null;
     private PublishingOptionsPane publishing_options_pane = null;
+    private Spit.Publishing.Authenticator authenticator = null;
    
     private PublishingParameters parameters = null;
 
     public FlickrPublisher(Spit.Publishing.Service service,
-        Spit.Publishing.PluginHost host) {
+                           Spit.Publishing.PluginHost host) {
         debug("FlickrPublisher instantiated.");
         this.service = service;
         this.host = host;
         this.session = new Session();
         this.parameters = new PublishingParameters();
-        
-        session.authenticated.connect(on_session_authenticated);
+        this.authenticator = Publishing.Authenticator.Factory.get_instance().create("flickr", host);
+
+        this.authenticator.authenticated.connect(on_session_authenticated);
     }
     
     ~FlickrPublisher() {
-        session.authenticated.disconnect(on_session_authenticated);
-    }
-    
-    private void invalidate_persistent_session() {
-        set_persistent_access_phase_token("");
-        set_persistent_access_phase_token_secret("");
-        set_persistent_access_phase_username("");
-    }
-    
-    private bool is_persistent_session_valid() {
-        return (get_persistent_access_phase_username() != null &&
-                get_persistent_access_phase_token() != null &&
-                get_persistent_access_phase_token_secret() != null);
-    }
-    
-    private string? get_persistent_access_phase_username() {
-        return host.get_config_string("access_phase_username", null);
-    }
-    
-    private void set_persistent_access_phase_username(string username) {
-        host.set_config_string("access_phase_username", username);
+        this.authenticator.authenticated.disconnect(on_session_authenticated);
     }
 
-    private string? get_persistent_access_phase_token() {
-        return host.get_config_string("access_phase_token", null);
-    }
-
-    private void set_persistent_access_phase_token(string token) {
-        host.set_config_string("access_phase_token", token);
-    }
-
-    private string? get_persistent_access_phase_token_secret() {
-        return host.get_config_string("access_phase_token_secret", null);
-    }
-
-    private void set_persistent_access_phase_token_secret(string secret) {
-        host.set_config_string("access_phase_token_secret", secret);
+    public Spit.Publishing.Authenticator get_authenticator() {
+        return this.authenticator;
     }
 
     private bool get_persistent_strip_metadata() {
         return host.get_config_bool("strip_metadata", false);
     }
-    
+
     private void set_persistent_strip_metadata(bool strip_metadata) {
         host.set_config_bool("strip_metadata", strip_metadata);
-    }    
-
-    private void on_welcome_pane_login_clicked() {
-        if (!running)
-            return;
-
-        debug("EVENT: user clicked 'Login' button in the welcome pane");
-        
-        do_run_authentication_request_transaction();
     }
 
-    private void on_auth_request_txn_completed(Publishing.RESTSupport.Transaction txn) {
-        txn.completed.disconnect(on_auth_request_txn_completed);
-        txn.network_error.disconnect(on_auth_request_txn_error);
-
-        if (!is_running())
-            return;
-
-        debug("EVENT: OAuth authentication request transaction completed; response = '%s'",
-            txn.get_response());
-
-        do_parse_token_info_from_auth_request(txn.get_response());
-    }
-
-    private void on_auth_request_txn_error(Publishing.RESTSupport.Transaction txn,
-        Spit.Publishing.PublishingError err) {
-        txn.completed.disconnect(on_auth_request_txn_completed);
-        txn.network_error.disconnect(on_auth_request_txn_error);
-
-        if (!is_running())
-            return;
-
-        debug("EVENT: OAuth authentication request transaction caused a network error");
-        host.post_error(err);
-    }
-    
-    private void on_authentication_token_available(string token, string token_secret) {
-        debug("EVENT: OAuth authentication token (%s) and token secret (%s) available",
-            token, token_secret);
-
-        session.set_request_phase_credentials(token, token_secret);
-
-        do_launch_system_browser(token);
-    }
-    
-    private void on_system_browser_launched() {
-        if (!is_running())
-            return;
-
-        debug("EVENT: system browser launched.");
-        
-        do_show_pin_entry_pane();
-    }
-    
-    private void on_pin_entry_proceed(PinEntryPane sender, string pin) {
-        sender.proceed.disconnect(on_pin_entry_proceed);
-        
+    private void on_session_authenticated() {
         if (!is_running())
             return;
 
-        debug("EVENT: user clicked 'Continue' in PIN entry pane.");
-        
-        do_verify_pin(pin);
-    }
+        debug("EVENT: a fully authenticated session has become available");
 
-    private void on_access_token_fetch_txn_completed(Publishing.RESTSupport.Transaction txn) {
-        txn.completed.disconnect(on_access_token_fetch_txn_completed);
-        txn.network_error.disconnect(on_access_token_fetch_error);
-        
-        if (!is_running())
-            return;
-        
-        debug("EVENT: fetching OAuth access token over the network succeeded");
-        
-        do_extract_access_phase_credentials_from_reponse(txn.get_response());
-    }
+        var params = this.authenticator.get_authentication_parameter();
+        Variant consumer_key = null;
+        Variant consumer_secret = null;
+        Variant auth_token = null;
+        Variant auth_token_secret = null;
+        Variant username = null;
 
-    private void on_access_token_fetch_error(Publishing.RESTSupport.Transaction txn,
-        Spit.Publishing.PublishingError err) {
-        txn.completed.disconnect(on_access_token_fetch_txn_completed);
-        txn.network_error.disconnect(on_access_token_fetch_error);
-        
-        if (!is_running())
-            return;
+        params.lookup_extended("ConsumerKey", null, out consumer_key);
+        params.lookup_extended("ConsumerSecret", null, out consumer_secret);
+        session.set_api_credentials(consumer_key.get_string(), consumer_secret.get_string());
 
-        debug("EVENT: fetching OAuth access token over the network caused an error.");
-        
-        host.post_error(err);
-    }
-    
-    private void on_session_authenticated() {
-        if (!is_running())
-            return;
+        params.lookup_extended("AuthToken", null, out auth_token);
+        params.lookup_extended("AuthTokenSecret", null, out auth_token_secret);
+        params.lookup_extended("Username", null, out username);
+        session.set_access_phase_credentials(auth_token.get_string(),
+                auth_token_secret.get_string(), username.get_string());
 
-        debug("EVENT: a fully authenticated session has become available");
-        
         parameters.username = session.get_username();
-        
-        set_persistent_access_phase_token(session.get_access_phase_token());
-        set_persistent_access_phase_token_secret(session.get_access_phase_token_secret());
-        set_persistent_access_phase_username(session.get_username());
-        
+
         do_fetch_account_info();
     }
 
@@ -360,126 +249,6 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object {
         host.post_error(err);
     }
 
-    private void do_show_login_welcome_pane() {
-        debug("ACTION: installing login welcome pane");
-
-        host.set_service_locked(false);
-        host.install_welcome_pane(SERVICE_WELCOME_MESSAGE, on_welcome_pane_login_clicked);
-    }
-    
-    private void do_run_authentication_request_transaction() {
-        debug("ACTION: running authentication request transaction");
-
-        host.set_service_locked(true);
-        host.install_static_message_pane(_("Preparing for login…"));
-
-        AuthenticationRequestTransaction txn = new AuthenticationRequestTransaction(session);
-        txn.completed.connect(on_auth_request_txn_completed);
-        txn.network_error.connect(on_auth_request_txn_error);
-        
-        try {
-            txn.execute();
-        } catch (Spit.Publishing.PublishingError err) {
-            host.post_error(err);
-        }
-    }
-    
-    private void do_parse_token_info_from_auth_request(string response) {
-        debug("ACTION: parsing authorization request response '%s' into token and secret", response);
-        
-        string? oauth_token = null;
-        string? oauth_token_secret = null;
-
-        var data = Soup.Form.decode(response);
-        data.lookup_extended("oauth_token", null, out oauth_token);
-        data.lookup_extended("oauth_token_secret", null, out oauth_token_secret);
-        
-        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", response));
-        
-        
-        on_authentication_token_available(oauth_token, oauth_token_secret);
-    }
-    
-    private void do_launch_system_browser(string token) {
-        string login_uri = "https://www.flickr.com/services/oauth/authorize?oauth_token=" + token +
-            "&perms=write";
-        
-        debug("ACTION: launching system browser with uri = '%s'", login_uri);
-        
-        try {
-            Process.spawn_command_line_async("xdg-open " + login_uri);
-        } catch (SpawnError e) {
-            host.post_error(new Spit.Publishing.PublishingError.LOCAL_FILE_ERROR(
-                "couldn't launch system web browser to complete Flickr login"));
-            return;
-        }
-        
-        on_system_browser_launched();
-    }
-    
-    private void do_show_pin_entry_pane() {
-        debug("ACTION: showing PIN entry pane");
-        
-        Gtk.Builder builder = new Gtk.Builder();
-        
-        try {
-            builder.add_from_resource (Resources.RESOURCE_PATH + "/" +
-                    "flickr_pin_entry_pane.ui");
-        } catch (Error e) {
-            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.")));
-            return;        
-        }
-        
-        PinEntryPane pin_entry_pane = new PinEntryPane(builder);
-        pin_entry_pane.proceed.connect(on_pin_entry_proceed);
-        host.install_dialog_pane(pin_entry_pane);
-    }
-    
-    private void do_verify_pin(string pin) {
-        debug("ACTION: validating authorization PIN %s", pin);
-        
-        host.set_service_locked(true);
-        host.install_static_message_pane(_("Verifying authorization…"));
-        
-        AccessTokenFetchTransaction txn = new AccessTokenFetchTransaction(session, pin);
-        txn.completed.connect(on_access_token_fetch_txn_completed);
-        txn.network_error.connect(on_access_token_fetch_error);
-        
-        try {
-            txn.execute();
-        } catch (Spit.Publishing.PublishingError err) {
-            host.post_error(err);
-        }
-    }
-    
-    private void do_extract_access_phase_credentials_from_reponse(string response) {
-        debug("ACTION: extracting access phase credentials from '%s'", response);
-
-        string? token = null;
-        string? token_secret = null;
-        string? username = null;
-
-        var data = Soup.Form.decode(response);
-        data.lookup_extended("oauth_token", null, out token);
-        data.lookup_extended("oauth_token_secret", null, out token_secret);
-        data.lookup_extended("username", null, out username);
-
-        debug("access phase credentials: { token = '%s'; token_secret = '%s'; username = '%s' }",
-            token, token_secret, username);
-
-        if (token == null || token_secret == null || username == null)
-            host.post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE("expected " +
-                "access phase credentials to contain token, token secret, and username but at " +
-                "least one of these is absent"));
-
-        session.set_access_phase_credentials(token, token_secret, username);
-    }
-
     private void do_fetch_account_info() {
         debug("ACTION: running network transaction to fetch account information");
 
@@ -544,8 +313,9 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object {
     private void do_logout() {
         debug("ACTION: logging user out, deauthenticating session, and erasing stored credentials");
 
-        session.deauthenticate();
-        invalidate_persistent_session();
+        if (authenticator.can_logout()) {
+            authenticator.logout();
+        }
 
         running = false;
 
@@ -650,16 +420,7 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object {
         running = true;
         was_started = true;
         
-        if (is_persistent_session_valid()) {
-            debug("attempt start: a persistent session is available; using it");
-
-            session.authenticate_from_persistent_credentials(get_persistent_access_phase_token(),
-                get_persistent_access_phase_token_secret(), get_persistent_access_phase_username());
-        } else {
-            debug("attempt start: no persistent session available; showing login welcome pane");
-
-            do_show_login_welcome_pane();
-        }
+        authenticator.authenticate();
     }
     
     public void start() {
@@ -684,60 +445,6 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object {
     }
 }
 
-internal class PinEntryPane : Spit.Publishing.DialogPane, GLib.Object {
-    private Gtk.Box pane_widget = null;
-    private Gtk.Button continue_button = null;
-    private Gtk.Entry pin_entry = null;
-    private Gtk.Label pin_entry_caption = null;
-    private Gtk.Label explanatory_text = null;
-    private Gtk.Builder builder = null;
-
-    public signal void proceed(PinEntryPane sender, string authorization_pin);
-
-    public PinEntryPane(Gtk.Builder builder) {
-        this.builder = builder;
-        assert(builder != null);
-        assert(builder.get_objects().length() > 0);        
-        
-        explanatory_text = builder.get_object("explanatory_text") as Gtk.Label;
-        pin_entry_caption = builder.get_object("pin_entry_caption") as Gtk.Label;
-        pin_entry = builder.get_object("pin_entry") as Gtk.Entry;
-        continue_button = builder.get_object("continue_button") as Gtk.Button;
-        
-        pane_widget = builder.get_object("pane_widget") as Gtk.Box;
-        
-        pane_widget.show_all();
-        
-        on_pin_entry_contents_changed();
-    }
-    
-    private void on_continue_clicked() {
-        proceed(this, pin_entry.get_text());
-    }
-    
-    private void on_pin_entry_contents_changed() {
-        continue_button.set_sensitive(pin_entry.text_length > 0);
-    }
-
-    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() {
-        continue_button.clicked.connect(on_continue_clicked);
-        pin_entry.changed.connect(on_pin_entry_contents_changed);
-    }
-
-    public void on_pane_uninstalled() {
-        continue_button.clicked.disconnect(on_continue_clicked);
-        pin_entry.changed.disconnect(on_pin_entry_contents_changed);
-    }
-}
-
 internal class Transaction : Publishing.RESTSupport.Transaction {
     public Transaction(Session session, Publishing.RESTSupport.HttpMethod method =
         Publishing.RESTSupport.HttpMethod.POST) {
@@ -748,7 +455,7 @@ internal class Transaction : Publishing.RESTSupport.Transaction {
         add_argument("oauth_version", "1.0");
         add_argument("oauth_callback", "oob");
         add_argument("oauth_timestamp", session.get_oauth_timestamp());
-        add_argument("oauth_consumer_key", API_KEY);
+        add_argument("oauth_consumer_key", session.get_consumer_key());
     }
     
     public Transaction.with_uri(Session session, string uri,
@@ -760,7 +467,7 @@ internal class Transaction : Publishing.RESTSupport.Transaction {
         add_argument("oauth_version", "1.0");
         add_argument("oauth_callback", "oob");
         add_argument("oauth_timestamp", session.get_oauth_timestamp());
-        add_argument("oauth_consumer_key", API_KEY);
+        add_argument("oauth_consumer_key", session.get_consumer_key());
     }
 
     public override void execute() throws Spit.Publishing.PublishingError {
@@ -818,22 +525,6 @@ internal class Transaction : Publishing.RESTSupport.Transaction {
     }
 }
 
-internal class AuthenticationRequestTransaction : Transaction {
-    public AuthenticationRequestTransaction(Session session) {
-        base.with_uri(session, "https://www.flickr.com/services/oauth/request_token",
-            Publishing.RESTSupport.HttpMethod.GET);
-    }
-}
-
-internal class AccessTokenFetchTransaction : Transaction {
-    public AccessTokenFetchTransaction(Session session, string user_verifier) {
-        base.with_uri(session, "https://www.flickr.com/services/oauth/access_token",
-            Publishing.RESTSupport.HttpMethod.GET);
-        add_argument("oauth_verifier", user_verifier);
-        add_argument("oauth_token", session.get_request_phase_token());
-    }
-}
-
 internal class AccountInfoFetchTransaction : Transaction {
     public AccountInfoFetchTransaction(Session session) {
         base(session, Publishing.RESTSupport.HttpMethod.GET);
@@ -860,7 +551,7 @@ private class UploadTransaction : Publishing.RESTSupport.UploadTransaction {
         add_authorization_header_field("oauth_version", "1.0");
         add_authorization_header_field("oauth_callback", "oob");
         add_authorization_header_field("oauth_timestamp", session.get_oauth_timestamp());
-        add_authorization_header_field("oauth_consumer_key", API_KEY);
+        add_authorization_header_field("oauth_consumer_key", session.get_consumer_key());
         add_authorization_header_field("oauth_token", session.get_access_phase_token());
         
         add_argument("is_public", ("%d".printf(parameters.visibility_specification.everyone_level)));
@@ -920,11 +611,11 @@ private class UploadTransaction : Publishing.RESTSupport.UploadTransaction {
 }
 
 internal class Session : Publishing.RESTSupport.Session {
-    private string? request_phase_token = null;
-    private string? request_phase_token_secret = null;
     private string? access_phase_token = null;
     private string? access_phase_token_secret = null;
     private string? username = null;
+    private string? consumer_key = null;
+    private string? consumer_secret = null;
 
     public Session() {
         base(ENDPOINT_URL);
@@ -935,19 +626,9 @@ internal class Session : Publishing.RESTSupport.Session {
             username != null);
     }
 
-    public void authenticate_from_persistent_credentials(string token, string secret,
-        string username) {
-        this.access_phase_token = token;
-        this.access_phase_token_secret = secret;
-        this.username = username;
-        
-        authenticated();
-    }
-    
-    public void deauthenticate() {
-        access_phase_token = null;
-        access_phase_token_secret = null;
-        username = null;
+    public void set_api_credentials(string consumer_key, string consumer_secret) {
+        this.consumer_key = consumer_key;
+        this.consumer_secret = consumer_secret;
     }
     
     public void sign_transaction(Publishing.RESTSupport.Transaction txn) {
@@ -984,16 +665,12 @@ internal class Session : Publishing.RESTSupport.Session {
         if (access_phase_token_secret != null) {
             debug("access phase token secret available; using it as signing key");
 
-            signing_key = API_SECRET + "&" + access_phase_token_secret;
-        } else if (request_phase_token_secret != null) {
-            debug("request phase token secret available; using it as signing key");
-
-            signing_key = API_SECRET + "&" + request_phase_token_secret;
+            signing_key = consumer_secret + "&" + access_phase_token_secret;
         } else {
             debug("neither access phase nor request phase token secrets available; using API " +
                 "key as signing key");
 
-            signing_key = API_SECRET + "&";
+            signing_key = consumer_secret + "&";
         }
         
         string signature_base_string = http_method + "&" + Soup.URI.encode(
@@ -1016,11 +693,6 @@ internal class Session : Publishing.RESTSupport.Session {
             txn.add_argument("oauth_signature", signature);
     }
     
-    public void set_request_phase_credentials(string token, string secret) {
-        this.request_phase_token = token;
-        this.request_phase_token_secret = secret;
-    }
-    
     public void set_access_phase_credentials(string token, string secret, string username) {
         this.access_phase_token = token;
         this.access_phase_token_secret = secret;
@@ -1040,22 +712,17 @@ internal class Session : Publishing.RESTSupport.Session {
     public string get_oauth_timestamp() {
         return GLib.get_real_time().to_string().substring(0, 10);
     }
-    
-    public string get_request_phase_token() {
-        assert(request_phase_token != null);
-        return request_phase_token;
+
+    public string get_consumer_key() {
+        assert(consumer_key != null);
+        return consumer_key;
     }
-    
+
     public string get_access_phase_token() {
         assert(access_phase_token != null);
         return access_phase_token;
     }
     
-    public string get_access_phase_token_secret() {
-        assert(access_phase_token_secret != null);
-        return access_phase_token_secret;
-    }
-    
     public string get_username() {
         assert(is_authenticated());
         return username;
@@ -1119,6 +786,10 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
         size_label = (Gtk.Label) this.builder.get_object("size_label");
         strip_metadata_check = (Gtk.CheckButton) this.builder.get_object("strip_metadata_check");
 
+        if (!publisher.get_authenticator().can_logout()) {
+            logout_button.parent.remove(logout_button);
+        }
+
         this.parameters = parameters;
         this.publisher = publisher;
         this.media_type = media_type;
diff --git a/plugins/shotwell-publishing/PicasaPublishing.c b/plugins/shotwell-publishing/PicasaPublishing.c
index 8547ca8..a040029 100644
--- a/plugins/shotwell-publishing/PicasaPublishing.c
+++ b/plugins/shotwell-publishing/PicasaPublishing.c
@@ -20,6 +20,7 @@
 #include <float.h>
 #include <math.h>
 #include <gtk/gtk.h>
+#include "shotwell-authenticator.h"
 #include <libsoup/soup.h>
 #include <gobject/gvaluecollector.h>
 
@@ -79,20 +80,9 @@ typedef struct _PublishingPicasaAlbumClass PublishingPicasaAlbumClass;
 
 typedef struct _PublishingPicasaAlbumDirectoryTransaction PublishingPicasaAlbumDirectoryTransaction;
 typedef struct _PublishingPicasaAlbumDirectoryTransactionClass PublishingPicasaAlbumDirectoryTransactionClass;
-
-#define PUBLISHING_PICASA_TYPE_ALBUM_CREATION_TRANSACTION (publishing_picasa_album_creation_transaction_get_type ())
-#define PUBLISHING_PICASA_ALBUM_CREATION_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_PICASA_TYPE_ALBUM_CREATION_TRANSACTION, PublishingPicasaAlbumCreationTransaction))
-#define PUBLISHING_PICASA_ALBUM_CREATION_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_PICASA_TYPE_ALBUM_CREATION_TRANSACTION, PublishingPicasaAlbumCreationTransactionClass))
-#define PUBLISHING_PICASA_IS_ALBUM_CREATION_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_PICASA_TYPE_ALBUM_CREATION_TRANSACTION))
-#define PUBLISHING_PICASA_IS_ALBUM_CREATION_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_PICASA_TYPE_ALBUM_CREATION_TRANSACTION))
-#define PUBLISHING_PICASA_ALBUM_CREATION_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_PICASA_TYPE_ALBUM_CREATION_TRANSACTION, PublishingPicasaAlbumCreationTransactionClass))
-
-typedef struct _PublishingPicasaAlbumCreationTransaction PublishingPicasaAlbumCreationTransaction;
-typedef struct _PublishingPicasaAlbumCreationTransactionClass PublishingPicasaAlbumCreationTransactionClass;
-#define _publishing_rest_support_xml_document_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_xml_document_unref (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)))
-typedef struct _PublishingPicasaAlbumPrivate PublishingPicasaAlbumPrivate;
+#define _publishing_rest_support_xml_document_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_xml_document_unref (var), NULL)))
 
 #define PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE (publishing_picasa_publishing_options_pane_get_type ())
 #define PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPicasaPublishingOptionsPane))
@@ -114,9 +104,9 @@ typedef struct _PublishingPicasaPublishingOptionsPaneClass PublishingPicasaPubli
 typedef struct _PublishingPicasaUploader PublishingPicasaUploader;
 typedef struct _PublishingPicasaUploaderClass PublishingPicasaUploaderClass;
 #define _publishing_rest_support_batch_uploader_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_batch_uploader_unref (var), NULL)))
+typedef struct _PublishingPicasaAlbumPrivate PublishingPicasaAlbumPrivate;
 typedef struct _PublishingPicasaParamSpecAlbum PublishingPicasaParamSpecAlbum;
 typedef struct _PublishingPicasaAlbumDirectoryTransactionPrivate PublishingPicasaAlbumDirectoryTransactionPrivate;
-typedef struct _PublishingPicasaAlbumCreationTransactionPrivate PublishingPicasaAlbumCreationTransactionPrivate;
 
 #define PUBLISHING_PICASA_TYPE_UPLOAD_TRANSACTION (publishing_picasa_upload_transaction_get_type ())
 #define PUBLISHING_PICASA_UPLOAD_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_PICASA_TYPE_UPLOAD_TRANSACTION, PublishingPicasaUploadTransaction))
@@ -179,7 +169,7 @@ struct _PublishingPicasaPicasaPublisherPrivate {
 	gpointer progress_reporter_target;
 	GDestroyNotify progress_reporter_target_destroy_notify;
 	PublishingPicasaPublishingParameters* publishing_parameters;
-	gchar* refresh_token;
+	SpitPublishingAuthenticator* authenticator;
 };
 
 struct _PublishingPicasaAlbum {
@@ -208,15 +198,6 @@ struct _PublishingPicasaAlbumDirectoryTransactionClass {
 	PublishingRESTSupportGooglePublisherAuthenticatedTransactionClass parent_class;
 };
 
-struct _PublishingPicasaAlbumCreationTransaction {
-	PublishingRESTSupportGooglePublisherAuthenticatedTransaction parent_instance;
-	PublishingPicasaAlbumCreationTransactionPrivate * priv;
-};
-
-struct _PublishingPicasaAlbumCreationTransactionClass {
-	PublishingRESTSupportGooglePublisherAuthenticatedTransactionClass parent_class;
-};
-
 struct _PublishingPicasaUploadTransaction {
 	PublishingRESTSupportGooglePublisherAuthenticatedTransaction parent_instance;
 	PublishingPicasaUploadTransactionPrivate * priv;
@@ -248,10 +229,7 @@ struct _PublishingPicasaPublishingOptionsPanePrivate {
 	GtkBox* pane_widget;
 	GtkLabel* login_identity_label;
 	GtkLabel* publish_to_label;
-	GtkRadioButton* use_existing_radio;
 	GtkComboBoxText* existing_albums_combo;
-	GtkRadioButton* create_new_radio;
-	GtkEntry* new_album_entry;
 	GtkCheckButton* public_check;
 	GtkComboBoxText* size_combo;
 	GtkCheckButton* strip_metadata_check;
@@ -303,7 +281,6 @@ struct _PublishingPicasaPublishingParametersPrivate {
 	gint albums_length1;
 	gint _albums_size_;
 	SpitPublishingPublisherMediaType media_type;
-	gboolean to_new_album;
 };
 
 struct _PublishingPicasaParamSpecPublishingParameters {
@@ -335,7 +312,6 @@ static SpitPublishingServiceIface* picasa_service_spit_publishing_service_parent
 static gpointer publishing_picasa_picasa_publisher_parent_class = NULL;
 static gpointer publishing_picasa_album_parent_class = NULL;
 static gpointer publishing_picasa_album_directory_transaction_parent_class = NULL;
-static gpointer publishing_picasa_album_creation_transaction_parent_class = NULL;
 static gpointer publishing_picasa_upload_transaction_parent_class = NULL;
 static gpointer publishing_picasa_publishing_options_pane_parent_class = NULL;
 static gpointer publishing_picasa_publishing_options_pane_size_description_parent_class = NULL;
@@ -362,11 +338,6 @@ GType publishing_picasa_picasa_publisher_get_type (void) G_GNUC_CONST;
 static SpitPublishingPublisherMediaType picasa_service_real_get_supported_media (SpitPublishingService* base);
 static void picasa_service_real_activation (SpitPluggable* base, gboolean enabled);
 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 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);
@@ -379,6 +350,8 @@ GType publishing_picasa_publishing_parameters_get_type (void) G_GNUC_CONST;
 enum  {
 	PUBLISHING_PICASA_PICASA_PUBLISHER_DUMMY_PROPERTY
 };
+#define PUBLISHING_PICASA_PICASA_PUBLISHER_DEFAULT_ALBUM_FEED_URL "https://picasaweb.google.com/data/feed/api/user/default/albumid/defaul" \
+"t"
 PublishingPicasaPublishingParameters* publishing_picasa_publishing_parameters_new (void);
 PublishingPicasaPublishingParameters* publishing_picasa_publishing_parameters_construct (GType object_type);
 static void publishing_picasa_picasa_publisher_load_parameters_from_configuration_system (PublishingPicasaPicasaPublisher* self, PublishingPicasaPublishingParameters* parameters);
@@ -394,6 +367,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
 PublishingPicasaAlbum* publishing_picasa_album_new (const gchar* name, const gchar* url);
 PublishingPicasaAlbum* publishing_picasa_album_construct (GType object_type, const gchar* name, const gchar* url);
 static void _vala_array_add12 (PublishingPicasaAlbum*** array, int* length, int* size, PublishingPicasaAlbum* value);
+static void _vala_array_add13 (PublishingPicasaAlbum*** array, int* length, int* size, PublishingPicasaAlbum* value);
 void publishing_picasa_publishing_parameters_set_major_axis_size_selection_id (PublishingPicasaPublishingParameters* self, gint selection_id);
 void publishing_picasa_publishing_parameters_set_strip_metadata (PublishingPicasaPublishingParameters* self, gboolean strip_metadata);
 void publishing_picasa_publishing_parameters_set_target_album_name (PublishingPicasaPublishingParameters* self, const gchar* target_album_name);
@@ -401,7 +375,6 @@ static void publishing_picasa_picasa_publisher_save_parameters_to_configuration_
 gint publishing_picasa_publishing_parameters_get_major_axis_size_selection_id (PublishingPicasaPublishingParameters* self);
 gboolean publishing_picasa_publishing_parameters_get_strip_metadata (PublishingPicasaPublishingParameters* self);
 gchar* publishing_picasa_publishing_parameters_get_target_album_name (PublishingPicasaPublishingParameters* self);
-static void publishing_picasa_picasa_publisher_on_service_welcome_login (PublishingPicasaPicasaPublisher* self);
 static void publishing_picasa_picasa_publisher_real_on_login_flow_complete (PublishingRESTSupportGooglePublisher* base);
 void publishing_picasa_publishing_parameters_set_user_name (PublishingPicasaPublishingParameters* self, const gchar* user_name);
 static void publishing_picasa_picasa_publisher_do_fetch_account_information (PublishingPicasaPicasaPublisher* self);
@@ -413,36 +386,24 @@ GType publishing_picasa_album_directory_transaction_get_type (void) G_GNUC_CONST
 static void publishing_picasa_picasa_publisher_do_parse_and_display_account_information (PublishingPicasaPicasaPublisher* self, PublishingPicasaAlbumDirectoryTransaction* transaction);
 static void publishing_picasa_picasa_publisher_on_publishing_options_logout (PublishingPicasaPicasaPublisher* self);
 static void publishing_picasa_picasa_publisher_on_publishing_options_publish (PublishingPicasaPicasaPublisher* self);
-gboolean publishing_picasa_publishing_parameters_is_to_new_album (PublishingPicasaPublishingParameters* self);
-static void publishing_picasa_picasa_publisher_do_create_album (PublishingPicasaPicasaPublisher* self);
 static void publishing_picasa_picasa_publisher_do_upload (PublishingPicasaPicasaPublisher* self);
-static void publishing_picasa_picasa_publisher_on_album_creation_complete (PublishingPicasaPicasaPublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_picasa_picasa_publisher_on_album_creation_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_picasa_picasa_publisher_on_album_creation_error (PublishingPicasaPicasaPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err);
-static void _publishing_picasa_picasa_publisher_on_album_creation_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-GType publishing_picasa_album_creation_transaction_get_type (void) G_GNUC_CONST;
-gchar* publishing_picasa_album_directory_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc);
-static gchar* _publishing_picasa_album_directory_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self);
-void publishing_picasa_publishing_parameters_set_target_album_entry_url (PublishingPicasaPublishingParameters* self, const gchar* target_album_url);
 static void publishing_picasa_picasa_publisher_on_upload_status_updated (PublishingPicasaPicasaPublisher* self, gint file_number, gdouble completed_fraction);
 static void publishing_picasa_picasa_publisher_on_upload_complete (PublishingPicasaPicasaPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published);
 static void _publishing_picasa_picasa_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self);
 static void publishing_picasa_picasa_publisher_on_upload_error (PublishingPicasaPicasaPublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err);
 static void _publishing_picasa_picasa_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self);
 static void publishing_picasa_picasa_publisher_do_show_success_pane (PublishingPicasaPicasaPublisher* self);
-static void publishing_picasa_picasa_publisher_do_show_service_welcome_pane (PublishingPicasaPicasaPublisher* self);
-static void _publishing_picasa_picasa_publisher_on_service_welcome_login_spit_publishing_login_callback (gpointer self);
 PublishingPicasaAlbumDirectoryTransaction* publishing_picasa_album_directory_transaction_new (PublishingRESTSupportGoogleSession* session);
 PublishingPicasaAlbumDirectoryTransaction* publishing_picasa_album_directory_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session);
+gchar* publishing_picasa_album_directory_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc);
+static gchar* _publishing_picasa_album_directory_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self);
 void publishing_picasa_publishing_parameters_set_albums (PublishingPicasaPublishingParameters* self, PublishingPicasaAlbum** albums, int albums_length1);
 static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane (PublishingPicasaPicasaPublisher* self);
 GType publishing_picasa_publishing_options_pane_get_type (void) G_GNUC_CONST;
-PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane_new (GtkBuilder* builder, PublishingPicasaPublishingParameters* parameters);
-PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane_construct (GType object_type, GtkBuilder* builder, PublishingPicasaPublishingParameters* parameters);
+PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane_new (GtkBuilder* builder, PublishingPicasaPublishingParameters* parameters, gboolean can_logout);
+PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane_construct (GType object_type, GtkBuilder* builder, PublishingPicasaPublishingParameters* parameters, gboolean can_logout);
 static void _publishing_picasa_picasa_publisher_on_publishing_options_publish_publishing_picasa_publishing_options_pane_publish (PublishingPicasaPublishingOptionsPane* _sender, gpointer self);
 static void _publishing_picasa_picasa_publisher_on_publishing_options_logout_publishing_picasa_publishing_options_pane_logout (PublishingPicasaPublishingOptionsPane* _sender, gpointer self);
-PublishingPicasaAlbumCreationTransaction* publishing_picasa_album_creation_transaction_new (PublishingRESTSupportGoogleSession* session, PublishingPicasaPublishingParameters* parameters);
-PublishingPicasaAlbumCreationTransaction* publishing_picasa_album_creation_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session, PublishingPicasaPublishingParameters* parameters);
 gint publishing_picasa_publishing_parameters_get_major_axis_size_pixels (PublishingPicasaPublishingParameters* self);
 GType publishing_picasa_uploader_get_type (void) G_GNUC_CONST;
 PublishingPicasaUploader* publishing_picasa_uploader_new (PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingPicasaPublishingParameters* parameters);
@@ -452,6 +413,7 @@ static void publishing_picasa_picasa_publisher_real_do_logout (PublishingRESTSup
 static gboolean publishing_picasa_picasa_publisher_real_is_running (PublishingRESTSupportGooglePublisher* base);
 static void publishing_picasa_picasa_publisher_real_start (PublishingRESTSupportGooglePublisher* base);
 static void publishing_picasa_picasa_publisher_real_stop (PublishingRESTSupportGooglePublisher* base);
+static SpitPublishingAuthenticator* publishing_picasa_picasa_publisher_real_get_authenticator (PublishingRESTSupportGooglePublisher* base);
 static void publishing_picasa_picasa_publisher_finalize (GObject* obj);
 enum  {
 	PUBLISHING_PICASA_ALBUM_DUMMY_PROPERTY
@@ -461,16 +423,6 @@ enum  {
 	PUBLISHING_PICASA_ALBUM_DIRECTORY_TRANSACTION_DUMMY_PROPERTY
 };
 #define PUBLISHING_PICASA_ALBUM_DIRECTORY_TRANSACTION_ENDPOINT_URL "https://picasaweb.google.com/data/feed/api/user/" "default"
-enum  {
-	PUBLISHING_PICASA_ALBUM_CREATION_TRANSACTION_DUMMY_PROPERTY
-};
-#define PUBLISHING_PICASA_ALBUM_CREATION_TRANSACTION_ENDPOINT_URL "https://picasaweb.google.com/data/feed/api/user/" "default"
-#define PUBLISHING_PICASA_ALBUM_CREATION_TRANSACTION_ALBUM_ENTRY_TEMPLATE "<?xml version='1.0' encoding='utf-8'?><entry xmlns='http://www.w3.org/" \
-"2005/Atom' xmlns:gphoto='http://schemas.google.com/photos/2007'><title" \
-" type='text'>%s</title><gphoto:access>%s</gphoto:access><category sche" \
-"me='http://schemas.google.com/g/2005#kind' term='http://schemas.google" \
-".com/photos/2007#album'></category></entry>"
-gboolean publishing_picasa_publishing_parameters_is_new_album_public (PublishingPicasaPublishingParameters* self);
 GType publishing_picasa_upload_transaction_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_PICASA_UPLOAD_TRANSACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PICASA_TYPE_UPLOAD_TRANSACTION, PublishingPicasaUploadTransactionPrivate))
 enum  {
@@ -504,29 +456,21 @@ enum  {
 static PublishingPicasaPublishingOptionsPaneSizeDescription** publishing_picasa_publishing_options_pane_create_size_descriptions (PublishingPicasaPublishingOptionsPane* self, int* result_length1);
 gchar* publishing_picasa_publishing_parameters_get_user_name (PublishingPicasaPublishingParameters* self);
 SpitPublishingPublisherMediaType publishing_picasa_publishing_parameters_get_media_type (PublishingPicasaPublishingParameters* self);
-static void publishing_picasa_publishing_options_pane_on_use_existing_radio_clicked (PublishingPicasaPublishingOptionsPane* self);
-static void _publishing_picasa_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void publishing_picasa_publishing_options_pane_on_create_new_radio_clicked (PublishingPicasaPublishingOptionsPane* self);
-static void _publishing_picasa_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void publishing_picasa_publishing_options_pane_on_new_album_entry_changed (PublishingPicasaPublishingOptionsPane* self);
-static void _publishing_picasa_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
 static void publishing_picasa_publishing_options_pane_on_logout_clicked (PublishingPicasaPublishingOptionsPane* self);
 static void _publishing_picasa_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
 static void publishing_picasa_publishing_options_pane_on_publish_clicked (PublishingPicasaPublishingOptionsPane* self);
 static void _publishing_picasa_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
 void publishing_picasa_publishing_parameters_set_major_axis_size_pixels (PublishingPicasaPublishingParameters* self, gint pixels);
 PublishingPicasaAlbum** publishing_picasa_publishing_parameters_get_albums (PublishingPicasaPublishingParameters* self, int* result_length1);
-void publishing_picasa_publishing_parameters_set_is_to_new_album (PublishingPicasaPublishingParameters* self, gboolean to_new_album);
-void publishing_picasa_publishing_parameters_set_is_new_album_public (PublishingPicasaPublishingParameters* self, gboolean album_public);
-static void publishing_picasa_publishing_options_pane_update_publish_button_sensitivity (PublishingPicasaPublishingOptionsPane* self);
+void publishing_picasa_publishing_parameters_set_target_album_entry_url (PublishingPicasaPublishingParameters* self, const gchar* target_album_url);
 static PublishingPicasaPublishingOptionsPaneSizeDescription* publishing_picasa_publishing_options_pane_size_description_new (const gchar* name, gint major_axis_pixels);
 static PublishingPicasaPublishingOptionsPaneSizeDescription* publishing_picasa_publishing_options_pane_size_description_construct (GType object_type, const gchar* name, gint major_axis_pixels);
-static void _vala_array_add13 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value);
 static void _vala_array_add14 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value);
 static void _vala_array_add15 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value);
 static void _vala_array_add16 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value);
-#define PUBLISHING_PICASA_PUBLISHING_PARAMETERS_ORIGINAL_SIZE -1
 static void _vala_array_add17 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value);
+#define PUBLISHING_PICASA_PUBLISHING_PARAMETERS_ORIGINAL_SIZE -1
+static void _vala_array_add18 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value);
 void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublishingOptionsPane* self);
 static GtkWidget* publishing_picasa_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base);
 static SpitPublishingDialogPaneGeometryOptions publishing_picasa_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
@@ -570,7 +514,7 @@ PicasaService* picasa_service_construct (GType object_type, GFile* resource_dire
 	_tmp0__length1 = picasa_service_icon_pixbuf_set_length1;
 #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 562 "PicasaPublishing.c"
+#line 513 "PicasaPublishing.c"
 		gint _tmp1_ = 0;
 		GdkPixbuf** _tmp2_ = NULL;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -583,18 +527,18 @@ PicasaService* picasa_service_construct (GType object_type, GFile* resource_dire
 		picasa_service_icon_pixbuf_set_length1 = _tmp1_;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_picasa_service_icon_pixbuf_set_size_ = picasa_service_icon_pixbuf_set_length1;
-#line 575 "PicasaPublishing.c"
+#line 526 "PicasaPublishing.c"
 	}
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 579 "PicasaPublishing.c"
+#line 530 "PicasaPublishing.c"
 }
 
 
 PicasaService* picasa_service_new (GFile* resource_directory) {
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return picasa_service_construct (TYPE_PICASA_SERVICE, resource_directory);
-#line 586 "PicasaPublishing.c"
+#line 537 "PicasaPublishing.c"
 }
 
 
@@ -616,7 +560,7 @@ static gint picasa_service_real_get_pluggable_interface (SpitPluggable* base, gi
 	result = _tmp2_;
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 608 "PicasaPublishing.c"
+#line 559 "PicasaPublishing.c"
 }
 
 
@@ -629,7 +573,7 @@ static const gchar* picasa_service_real_get_id (SpitPluggable* base) {
 	result = "org.yorba.shotwell.publishing.picasa";
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 621 "PicasaPublishing.c"
+#line 572 "PicasaPublishing.c"
 }
 
 
@@ -642,14 +586,14 @@ static const gchar* picasa_service_real_get_pluggable_name (SpitPluggable* base)
 	result = "Picasa Web Albums";
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 634 "PicasaPublishing.c"
+#line 585 "PicasaPublishing.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 641 "PicasaPublishing.c"
+#line 592 "PicasaPublishing.c"
 }
 
 
@@ -660,17 +604,17 @@ static GdkPixbuf** _vala_array_dup4 (GdkPixbuf** self, int length) {
 	result = g_new0 (GdkPixbuf*, length + 1);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 652 "PicasaPublishing.c"
+#line 603 "PicasaPublishing.c"
 		GdkPixbuf* _tmp0_ = NULL;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		result[i] = _tmp0_;
-#line 658 "PicasaPublishing.c"
+#line 609 "PicasaPublishing.c"
 	}
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 662 "PicasaPublishing.c"
+#line 613 "PicasaPublishing.c"
 }
 
 
@@ -752,7 +696,7 @@ static void picasa_service_real_get_info (SpitPluggable* base, SpitPluggableInfo
 	(*info).icons = _tmp9_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*info).icons_length1 = _tmp9__length1;
-#line 744 "PicasaPublishing.c"
+#line 695 "PicasaPublishing.c"
 }
 
 
@@ -773,7 +717,7 @@ static SpitPublishingPublisher* picasa_service_real_create_publisher (SpitPublis
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 765 "PicasaPublishing.c"
+#line 716 "PicasaPublishing.c"
 }
 
 
@@ -786,7 +730,7 @@ static SpitPublishingPublisherMediaType picasa_service_real_get_supported_media
 	result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO;
 #line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 778 "PicasaPublishing.c"
+#line 729 "PicasaPublishing.c"
 }
 
 
@@ -794,7 +738,7 @@ static void picasa_service_real_activation (SpitPluggable* base, gboolean enable
 	PicasaService * self;
 #line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PICASA_SERVICE, PicasaService);
-#line 786 "PicasaPublishing.c"
+#line 737 "PicasaPublishing.c"
 }
 
 
@@ -803,7 +747,7 @@ static void picasa_service_class_init (PicasaServiceClass * klass) {
 	picasa_service_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = picasa_service_finalize;
-#line 795 "PicasaPublishing.c"
+#line 746 "PicasaPublishing.c"
 }
 
 
@@ -820,7 +764,7 @@ static void picasa_service_spit_pluggable_interface_init (SpitPluggableIface * i
 	iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) picasa_service_real_get_info;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	iface->activation = (void (*)(SpitPluggable*, gboolean)) picasa_service_real_activation;
-#line 812 "PicasaPublishing.c"
+#line 763 "PicasaPublishing.c"
 }
 
 
@@ -831,7 +775,7 @@ static void picasa_service_spit_publishing_service_interface_init (SpitPublishin
 	iface->create_publisher = (SpitPublishingPublisher* (*)(SpitPublishingService*, SpitPublishingPluginHost*)) picasa_service_real_create_publisher;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	iface->get_supported_media = (SpitPublishingPublisherMediaType (*)(SpitPublishingService*)) picasa_service_real_get_supported_media;
-#line 823 "PicasaPublishing.c"
+#line 774 "PicasaPublishing.c"
 }
 
 
@@ -845,7 +789,7 @@ static void picasa_service_finalize (GObject* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PICASA_SERVICE, PicasaService);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	G_OBJECT_CLASS (picasa_service_parent_class)->finalize (obj);
-#line 837 "PicasaPublishing.c"
+#line 788 "PicasaPublishing.c"
 }
 
 
@@ -877,130 +821,137 @@ PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_construct (G
 	SpitPublishingPublishable** _tmp6_ = NULL;
 	PublishingPicasaPublishingParameters* _tmp11_ = NULL;
 	SpitPublishingPublisherMediaType _tmp12_ = 0;
-	SpitPublishingPluginHost* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = service;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = host;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = (PublishingPicasaPicasaPublisher*) publishing_rest_support_google_publisher_construct (object_type, _tmp0_, _tmp1_, "https://picasaweb.google.com/data/");
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = publishing_picasa_publishing_parameters_new ();
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_picasa_publishing_parameters_unref0 (self->priv->publishing_parameters);
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->publishing_parameters = _tmp2_;
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp3_ = self->priv->publishing_parameters;
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_load_parameters_from_configuration_system (self, _tmp3_);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	media_type = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_NONE;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4_ = host;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp6_ = spit_publishing_plugin_host_get_publishables (_tmp4_, &_tmp5_);
-#line 897 "PicasaPublishing.c"
+#line 846 "PicasaPublishing.c"
 	{
 		SpitPublishingPublishable** p_collection = NULL;
 		gint p_collection_length1 = 0;
 		gint _p_collection_size_ = 0;
 		gint p_it = 0;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		p_collection = _tmp6_;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		p_collection_length1 = _tmp5_;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		for (p_it = 0; p_it < _tmp5_; p_it = p_it + 1) {
-#line 909 "PicasaPublishing.c"
+#line 858 "PicasaPublishing.c"
 			SpitPublishingPublishable* _tmp7_ = NULL;
 			SpitPublishingPublishable* p = NULL;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_tmp7_ = _g_object_ref0 (p_collection[p_it]);
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			p = _tmp7_;
-#line 916 "PicasaPublishing.c"
+#line 865 "PicasaPublishing.c"
 			{
 				SpitPublishingPublisherMediaType _tmp8_ = 0;
 				SpitPublishingPublishable* _tmp9_ = NULL;
 				SpitPublishingPublisherMediaType _tmp10_ = 0;
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp8_ = media_type;
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp9_ = p;
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp10_ = spit_publishing_publishable_get_media_type (_tmp9_);
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-				media_type = _tmp8_ | _tmp10_;
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+				media_type = _tmp8_ | _tmp10_;
+#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_g_object_unref0 (p);
-#line 931 "PicasaPublishing.c"
+#line 880 "PicasaPublishing.c"
 			}
 		}
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		p_collection = (_vala_array_free (p_collection, p_collection_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 936 "PicasaPublishing.c"
+#line 885 "PicasaPublishing.c"
 	}
-#line 78 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp11_ = self->priv->publishing_parameters;
-#line 78 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp12_ = media_type;
-#line 78 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_publishing_parameters_set_media_type (_tmp11_, _tmp12_);
-#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp13_ = host;
-#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp14_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "refresh_token", NULL);
-#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (self->priv->refresh_token);
-#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->refresh_token = _tmp14_;
-#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
-#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->progress_reporter = NULL;
-#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->progress_reporter_target = NULL;
-#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->progress_reporter = NULL;
-#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->progress_reporter_target = NULL;
-#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 968 "PicasaPublishing.c"
+#line 909 "PicasaPublishing.c"
 }
 
 
 PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return publishing_picasa_picasa_publisher_construct (PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, service, host);
-#line 975 "PicasaPublishing.c"
+#line 916 "PicasaPublishing.c"
 }
 
 
 static void _vala_array_add12 (PublishingPicasaAlbum*** array, int* length, int* size, PublishingPicasaAlbum* value) {
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	if ((*length) == (*size)) {
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		*size = (*size) ? (2 * (*size)) : 4;
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		*array = g_renew (PublishingPicasaAlbum*, *array, (*size) + 1);
+#line 927 "PicasaPublishing.c"
+	}
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	(*array)[(*length)++] = value;
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	(*array)[*length] = NULL;
+#line 933 "PicasaPublishing.c"
+}
+
+
+static void _vala_array_add13 (PublishingPicasaAlbum*** array, int* length, int* size, PublishingPicasaAlbum* value) {
+#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if ((*length) == (*size)) {
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*array = g_renew (PublishingPicasaAlbum*, *array, (*size) + 1);
-#line 986 "PicasaPublishing.c"
+#line 944 "PicasaPublishing.c"
 	}
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[*length] = NULL;
-#line 992 "PicasaPublishing.c"
+#line 950 "PicasaPublishing.c"
 }
 
 
@@ -1013,270 +964,298 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
 	xmlNode* doc_node_iter = NULL;
 	xmlNode* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
-	PublishingPicasaAlbum** _tmp36_ = NULL;
-	gint _tmp36__length1 = 0;
+	PublishingPicasaAlbum** _tmp9_ = NULL;
+	gint _tmp9__length1 = 0;
+	const gchar* _tmp10_ = NULL;
+	PublishingPicasaAlbum* _tmp11_ = NULL;
+	PublishingPicasaAlbum** _tmp40_ = NULL;
+	gint _tmp40__length1 = 0;
 	GError * _inner_error_ = NULL;
-#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self), NULL);
-#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = g_new0 (PublishingPicasaAlbum*, 0 + 1);
-#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_result_ = _tmp0_;
-#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_result__length1 = 0;
-#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	__result__size_ = _result__length1;
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	doc_node_iter = NULL;
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = document_root;
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = _tmp1_->name;
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (g_strcmp0 (_tmp2_, "feed") == 0) {
-#line 1026 "PicasaPublishing.c"
+#line 988 "PicasaPublishing.c"
 		xmlNode* _tmp3_ = NULL;
 		xmlNode* _tmp4_ = NULL;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp3_ = document_root;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp4_ = _tmp3_->children;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		doc_node_iter = _tmp4_;
-#line 1035 "PicasaPublishing.c"
+#line 997 "PicasaPublishing.c"
 	} else {
 		xmlNode* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
-#line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp5_ = document_root;
-#line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp6_ = _tmp5_->name;
-#line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		if (g_strcmp0 (_tmp6_, "entry") == 0) {
-#line 1045 "PicasaPublishing.c"
+#line 1007 "PicasaPublishing.c"
 			xmlNode* _tmp7_ = NULL;
-#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_tmp7_ = document_root;
-#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			doc_node_iter = _tmp7_;
-#line 1051 "PicasaPublishing.c"
+#line 1013 "PicasaPublishing.c"
 		} else {
 			GError* _tmp8_ = NULL;
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_tmp8_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "response root node " "isn't a <feed> or <entry>");
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_inner_error_ = _tmp8_;
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				g_propagate_error (error, _inner_error_);
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_result_ = (_vala_array_free (_result_, _result__length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				return NULL;
-#line 1066 "PicasaPublishing.c"
+#line 1028 "PicasaPublishing.c"
 			} else {
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_result_ = (_vala_array_free (_result_, _result__length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.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 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				g_clear_error (&_inner_error_);
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				return NULL;
-#line 1076 "PicasaPublishing.c"
+#line 1038 "PicasaPublishing.c"
 			}
 		}
 	}
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp9_ = _result_;
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp9__length1 = _result__length1;
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp10_ = _ ("Default album");
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp11_ = publishing_picasa_album_new (_tmp10_, PUBLISHING_PICASA_PICASA_PUBLISHER_DEFAULT_ALBUM_FEED_URL);
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_vala_array_add12 (&_result_, &_result__length1, &__result__size_, _tmp11_);
+#line 1052 "PicasaPublishing.c"
 	{
-		gboolean _tmp9_ = FALSE;
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp9_ = TRUE;
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		gboolean _tmp12_ = FALSE;
+#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp12_ = TRUE;
+#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		while (TRUE) {
-#line 1086 "PicasaPublishing.c"
-			xmlNode* _tmp12_ = NULL;
-			xmlNode* _tmp13_ = NULL;
-			const gchar* _tmp14_ = NULL;
+#line 1059 "PicasaPublishing.c"
+			xmlNode* _tmp15_ = NULL;
+			xmlNode* _tmp16_ = NULL;
+			const gchar* _tmp17_ = NULL;
 			gchar* name_val = NULL;
 			gchar* url_val = NULL;
 			xmlNode* album_node_iter = NULL;
-			xmlNode* _tmp15_ = NULL;
-			xmlNode* _tmp16_ = NULL;
-			PublishingPicasaAlbum** _tmp32_ = NULL;
-			gint _tmp32__length1 = 0;
-			const gchar* _tmp33_ = NULL;
-			const gchar* _tmp34_ = NULL;
-			PublishingPicasaAlbum* _tmp35_ = NULL;
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			if (!_tmp9_) {
-#line 1102 "PicasaPublishing.c"
-				xmlNode* _tmp10_ = NULL;
-				xmlNode* _tmp11_ = NULL;
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-				_tmp10_ = doc_node_iter;
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-				_tmp11_ = _tmp10_->next;
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-				doc_node_iter = _tmp11_;
-#line 1111 "PicasaPublishing.c"
-			}
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp9_ = FALSE;
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp12_ = doc_node_iter;
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			if (!(_tmp12_ != NULL)) {
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-				break;
-#line 1121 "PicasaPublishing.c"
+			xmlNode* _tmp18_ = NULL;
+			xmlNode* _tmp19_ = NULL;
+			const gchar* _tmp35_ = NULL;
+			PublishingPicasaAlbum** _tmp36_ = NULL;
+			gint _tmp36__length1 = 0;
+			const gchar* _tmp37_ = NULL;
+			const gchar* _tmp38_ = NULL;
+			PublishingPicasaAlbum* _tmp39_ = NULL;
+#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			if (!_tmp12_) {
+#line 1076 "PicasaPublishing.c"
+				xmlNode* _tmp13_ = NULL;
+				xmlNode* _tmp14_ = NULL;
+#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+				_tmp13_ = doc_node_iter;
+#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+				_tmp14_ = _tmp13_->next;
+#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+				doc_node_iter = _tmp14_;
+#line 1085 "PicasaPublishing.c"
 			}
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp13_ = doc_node_iter;
+			_tmp12_ = FALSE;
+#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_tmp15_ = doc_node_iter;
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp14_ = _tmp13_->name;
+			if (!(_tmp15_ != NULL)) {
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			if (g_strcmp0 (_tmp14_, "entry") != 0) {
+				break;
+#line 1095 "PicasaPublishing.c"
+			}
+#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_tmp16_ = doc_node_iter;
 #line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_tmp17_ = _tmp16_->name;
+#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			if (g_strcmp0 (_tmp17_, "entry") != 0) {
+#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				continue;
-#line 1131 "PicasaPublishing.c"
+#line 1105 "PicasaPublishing.c"
 			}
-#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			name_val = NULL;
 #line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			url_val = NULL;
-#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp15_ = doc_node_iter;
-#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp16_ = _tmp15_->children;
+			name_val = NULL;
 #line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			album_node_iter = _tmp16_;
-#line 1143 "PicasaPublishing.c"
-			{
-				gboolean _tmp17_ = FALSE;
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-				_tmp17_ = TRUE;
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-				while (TRUE) {
-#line 1150 "PicasaPublishing.c"
-					xmlNode* _tmp20_ = NULL;
-					xmlNode* _tmp21_ = NULL;
-					const gchar* _tmp22_ = NULL;
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					if (!_tmp17_) {
-#line 1156 "PicasaPublishing.c"
-						xmlNode* _tmp18_ = NULL;
-						xmlNode* _tmp19_ = NULL;
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp18_ = album_node_iter;
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp19_ = _tmp18_->next;
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						album_node_iter = _tmp19_;
-#line 1165 "PicasaPublishing.c"
-					}
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp17_ = FALSE;
+			url_val = NULL;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp20_ = album_node_iter;
+			_tmp18_ = doc_node_iter;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					if (!(_tmp20_ != NULL)) {
+			_tmp19_ = _tmp18_->children;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						break;
-#line 1175 "PicasaPublishing.c"
+			album_node_iter = _tmp19_;
+#line 1117 "PicasaPublishing.c"
+			{
+				gboolean _tmp20_ = FALSE;
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+				_tmp20_ = TRUE;
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+				while (TRUE) {
+#line 1124 "PicasaPublishing.c"
+					xmlNode* _tmp23_ = NULL;
+					xmlNode* _tmp24_ = NULL;
+					const gchar* _tmp25_ = NULL;
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+					if (!_tmp20_) {
+#line 1130 "PicasaPublishing.c"
+						xmlNode* _tmp21_ = NULL;
+						xmlNode* _tmp22_ = NULL;
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+						_tmp21_ = album_node_iter;
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+						_tmp22_ = _tmp21_->next;
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+						album_node_iter = _tmp22_;
+#line 1139 "PicasaPublishing.c"
 					}
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp21_ = album_node_iter;
+					_tmp20_ = FALSE;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp22_ = _tmp21_->name;
+					_tmp23_ = album_node_iter;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					if (g_strcmp0 (_tmp22_, "title") == 0) {
-#line 1183 "PicasaPublishing.c"
-						xmlNode* _tmp23_ = NULL;
-						gchar* _tmp24_ = NULL;
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp23_ = album_node_iter;
+					if (!(_tmp23_ != NULL)) {
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+						break;
+#line 1149 "PicasaPublishing.c"
+					}
 #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp24_ = (gchar*) xmlNodeGetContent (_tmp23_);
+					_tmp24_ = album_node_iter;
 #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_g_free0 (name_val);
+					_tmp25_ = _tmp24_->name;
 #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						name_val = _tmp24_;
-#line 1194 "PicasaPublishing.c"
-					} else {
-						xmlNode* _tmp25_ = NULL;
-						const gchar* _tmp26_ = NULL;
+					if (g_strcmp0 (_tmp25_, "title") == 0) {
+#line 1157 "PicasaPublishing.c"
+						xmlNode* _tmp26_ = NULL;
+						gchar* _tmp27_ = NULL;
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp25_ = album_node_iter;
+						_tmp26_ = album_node_iter;
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp26_ = _tmp25_->name;
+						_tmp27_ = (gchar*) xmlNodeGetContent (_tmp26_);
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						if (g_strcmp0 (_tmp26_, "id") == 0) {
-#line 1204 "PicasaPublishing.c"
-							xmlNode* _tmp27_ = NULL;
-							xmlNs* _tmp28_ = NULL;
-							const gchar* _tmp29_ = NULL;
+						_g_free0 (name_val);
+#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+						name_val = _tmp27_;
+#line 1168 "PicasaPublishing.c"
+					} else {
+						xmlNode* _tmp28_ = NULL;
+						const gchar* _tmp29_ = NULL;
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+						_tmp28_ = album_node_iter;
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+						_tmp29_ = _tmp28_->name;
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+						if (g_strcmp0 (_tmp29_, "id") == 0) {
+#line 1178 "PicasaPublishing.c"
 							xmlNode* _tmp30_ = NULL;
-							gchar* _tmp31_ = NULL;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-							_tmp27_ = album_node_iter;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-							_tmp28_ = _tmp27_->ns;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-							_tmp29_ = _tmp28_->prefix;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-							if (_tmp29_ != NULL) {
+							xmlNs* _tmp31_ = NULL;
+							const gchar* _tmp32_ = NULL;
+							xmlNode* _tmp33_ = NULL;
+							gchar* _tmp34_ = NULL;
 #line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-								continue;
-#line 1220 "PicasaPublishing.c"
-							}
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 							_tmp30_ = album_node_iter;
+#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+							_tmp31_ = _tmp30_->ns;
+#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+							_tmp32_ = _tmp31_->prefix;
+#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+							if (_tmp32_ != NULL) {
 #line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-							_tmp31_ = (gchar*) xmlNodeGetContent (_tmp30_);
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+								continue;
+#line 1194 "PicasaPublishing.c"
+							}
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+							_tmp33_ = album_node_iter;
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+							_tmp34_ = (gchar*) xmlNodeGetContent (_tmp33_);
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 							_g_free0 (url_val);
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-							url_val = _tmp31_;
-#line 1230 "PicasaPublishing.c"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+							url_val = _tmp34_;
+#line 1204 "PicasaPublishing.c"
 						}
 					}
 				}
 			}
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp32_ = _result_;
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp32__length1 = _result__length1;
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp33_ = name_val;
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp34_ = url_val;
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp35_ = publishing_picasa_album_new (_tmp33_, _tmp34_);
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_vala_array_add12 (&_result_, &_result__length1, &__result__size_, _tmp35_);
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_tmp35_ = url_val;
+#line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			if (g_strcmp0 (_tmp35_, PUBLISHING_PICASA_PICASA_PUBLISHER_DEFAULT_ALBUM_FEED_URL) == 0) {
+#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+				_g_free0 (url_val);
+#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+				_g_free0 (name_val);
+#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+				continue;
+#line 1219 "PicasaPublishing.c"
+			}
+#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_tmp36_ = _result_;
+#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_tmp36__length1 = _result__length1;
+#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_tmp37_ = name_val;
+#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_tmp38_ = url_val;
+#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_tmp39_ = publishing_picasa_album_new (_tmp37_, _tmp38_);
+#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_vala_array_add13 (&_result_, &_result__length1, &__result__size_, _tmp39_);
+#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_free0 (url_val);
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_free0 (name_val);
-#line 1251 "PicasaPublishing.c"
+#line 1237 "PicasaPublishing.c"
 		}
 	}
-#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp36_ = _result_;
-#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp36__length1 = _result__length1;
-#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp40_ = _result_;
+#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp40__length1 = _result__length1;
+#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (result_length1) {
-#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		*result_length1 = _tmp36__length1;
-#line 1262 "PicasaPublishing.c"
+#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		*result_length1 = _tmp40__length1;
+#line 1248 "PicasaPublishing.c"
 	}
-#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	result = _tmp36_;
-#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	result = _tmp40_;
+#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 1268 "PicasaPublishing.c"
+#line 1254 "PicasaPublishing.c"
 }
 
 
@@ -1291,39 +1270,39 @@ static void publishing_picasa_picasa_publisher_load_parameters_from_configuratio
 	SpitPublishingPluginHost* _tmp7_ = NULL;
 	gchar* _tmp8_ = NULL;
 	gchar* _tmp9_ = NULL;
-#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
-#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (parameters));
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = parameters;
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default-size", 0);
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_publishing_parameters_set_major_axis_size_selection_id (_tmp0_, _tmp2_);
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp3_ = parameters;
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp5_ = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip-metadata", FALSE);
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_publishing_parameters_set_strip_metadata (_tmp3_, _tmp5_);
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp6_ = parameters;
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp7_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp8_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-album", NULL);
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp9_ = _tmp8_;
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_publishing_parameters_set_target_album_name (_tmp6_, _tmp9_);
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (_tmp9_);
-#line 1315 "PicasaPublishing.c"
+#line 1301 "PicasaPublishing.c"
 }
 
 
@@ -1338,131 +1317,86 @@ static void publishing_picasa_picasa_publisher_save_parameters_to_configuration_
 	PublishingPicasaPublishingParameters* _tmp7_ = NULL;
 	gchar* _tmp8_ = NULL;
 	gchar* _tmp9_ = NULL;
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (parameters));
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = parameters;
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = publishing_picasa_publishing_parameters_get_major_axis_size_selection_id (_tmp1_);
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default-size", _tmp2_);
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp3_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4_ = parameters;
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp5_ = publishing_picasa_publishing_parameters_get_strip_metadata (_tmp4_);
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", _tmp5_);
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp6_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp7_ = parameters;
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp8_ = publishing_picasa_publishing_parameters_get_target_album_name (_tmp7_);
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp9_ = _tmp8_;
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-album", _tmp9_);
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (_tmp9_);
-#line 1362 "PicasaPublishing.c"
-}
-
-
-static void publishing_picasa_picasa_publisher_on_service_welcome_login (PublishingPicasaPicasaPublisher* self) {
-	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
-#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
-#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:136: EVENT: user clicked 'Login' in welcome pane" \
-".");
 #line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-album", _tmp9_);
 #line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (!_tmp0_) {
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		return;
-#line 1379 "PicasaPublishing.c"
-	}
-#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp1_ = self->priv->refresh_token;
-#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_rest_support_google_publisher_start_oauth_flow (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher), _tmp1_);
-#line 1385 "PicasaPublishing.c"
+	_g_free0 (_tmp9_);
+#line 1348 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_picasa_publisher_real_on_login_flow_complete (PublishingRESTSupportGooglePublisher* base) {
 	PublishingPicasaPicasaPublisher * self;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
+	PublishingPicasaPublishingParameters* _tmp0_ = NULL;
 	PublishingRESTSupportGoogleSession* _tmp1_ = NULL;
 	PublishingRESTSupportGoogleSession* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	gchar* _tmp4_ = NULL;
-	PublishingPicasaPublishingParameters* _tmp5_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp6_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, PublishingPicasaPicasaPublisher);
+#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_debug ("PicasaPublishing.vala:142: EVENT: OAuth login flow complete.");
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp0_ = self->priv->publishing_parameters;
 #line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:145: EVENT: OAuth login flow complete.");
-#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = publishing_rest_support_google_publisher_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = _tmp1_;
-#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp3_ = publishing_rest_support_google_session_get_refresh_token (_tmp2_);
-#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp3_ = publishing_rest_support_google_session_get_user_name (_tmp2_);
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4_ = _tmp3_;
-#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "refresh_token", _tmp4_);
-#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	publishing_picasa_publishing_parameters_set_user_name (_tmp0_, _tmp4_);
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (_tmp4_);
-#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_rest_support_session_unref0 (_tmp2_);
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp5_ = self->priv->publishing_parameters;
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp6_ = publishing_rest_support_google_publisher_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp7_ = _tmp6_;
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp8_ = publishing_rest_support_google_session_get_user_name (_tmp7_);
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp9_ = _tmp8_;
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_picasa_publishing_parameters_set_user_name (_tmp5_, _tmp9_);
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (_tmp9_);
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_publishing_rest_support_session_unref0 (_tmp7_);
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_do_fetch_account_information (self);
-#line 1439 "PicasaPublishing.c"
+#line 1381 "PicasaPublishing.c"
 }
 
 
 static void _publishing_picasa_picasa_publisher_on_initial_album_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_on_initial_album_fetch_complete ((PublishingPicasaPicasaPublisher*) self, _sender);
-#line 1446 "PicasaPublishing.c"
+#line 1388 "PicasaPublishing.c"
 }
 
 
 static void _publishing_picasa_picasa_publisher_on_initial_album_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_on_initial_album_fetch_error ((PublishingPicasaPicasaPublisher*) self, _sender, err);
-#line 1453 "PicasaPublishing.c"
+#line 1395 "PicasaPublishing.c"
 }
 
 
@@ -1473,38 +1407,38 @@ static void publishing_picasa_picasa_publisher_on_initial_album_fetch_complete (
 	guint _tmp3_ = 0U;
 	gboolean _tmp4_ = FALSE;
 	PublishingRESTSupportTransaction* _tmp5_ = NULL;
-#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
-#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = txn;
-#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_initial_album_fetch_complete_publishing_rest_support_transaction_completed, self);
-#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = txn;
-#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_initial_album_fetch_error_publishing_rest_support_transaction_network_error, self);
-#line 158 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 158 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!_tmp4_) {
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 1486 "PicasaPublishing.c"
+#line 1428 "PicasaPublishing.c"
 	}
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:161: EVENT: finished fetching account and album " \
+#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_debug ("PicasaPublishing.vala:157: EVENT: finished fetching account and album " \
 "information.");
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp5_ = txn;
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_do_parse_and_display_account_information (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_PICASA_TYPE_ALBUM_DIRECTORY_TRANSACTION, PublishingPicasaAlbumDirectoryTransaction));
-#line 1494 "PicasaPublishing.c"
+#line 1436 "PicasaPublishing.c"
 }
 
 
@@ -1520,535 +1454,124 @@ static void publishing_picasa_picasa_publisher_on_initial_album_fetch_error (Pub
 	gboolean _tmp8_ = FALSE;
 	PublishingRESTSupportTransaction* _tmp9_ = NULL;
 	guint _tmp10_ = 0U;
-#line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
-#line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn));
-#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = bad_txn;
-#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_initial_album_fetch_complete_publishing_rest_support_transaction_completed, self);
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = bad_txn;
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_initial_album_fetch_error_publishing_rest_support_transaction_network_error, self);
-#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!_tmp4_) {
-#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 1532 "PicasaPublishing.c"
+#line 1474 "PicasaPublishing.c"
 	}
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp5_ = bad_txn;
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp6_ = publishing_rest_support_transaction_get_response (_tmp5_);
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp7_ = _tmp6_;
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:174: EVENT: fetching account and album informati" \
+#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_debug ("PicasaPublishing.vala:170: EVENT: fetching account and album informati" \
 "on failed; response = '%s'.", _tmp7_);
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (_tmp7_);
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp9_ = bad_txn;
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp10_ = publishing_rest_support_transaction_get_status_code (_tmp9_);
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (_tmp10_ == ((guint) 403)) {
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp8_ = TRUE;
-#line 1552 "PicasaPublishing.c"
+#line 1494 "PicasaPublishing.c"
 	} else {
 		PublishingRESTSupportTransaction* _tmp11_ = NULL;
 		guint _tmp12_ = 0U;
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp11_ = bad_txn;
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp12_ = publishing_rest_support_transaction_get_status_code (_tmp11_);
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp8_ = _tmp12_ == ((guint) 404);
-#line 1562 "PicasaPublishing.c"
+#line 1504 "PicasaPublishing.c"
 	}
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (_tmp8_) {
-#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_rest_support_google_publisher_do_logout (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 1568 "PicasaPublishing.c"
+#line 1510 "PicasaPublishing.c"
 	} else {
 		SpitPublishingPluginHost* _tmp13_ = NULL;
 		GError* _tmp14_ = NULL;
-#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp13_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp14_ = err;
-#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp13_, _tmp14_);
-#line 1578 "PicasaPublishing.c"
+#line 1520 "PicasaPublishing.c"
 	}
 }
 
 
 static void publishing_picasa_picasa_publisher_on_publishing_options_logout (PublishingPicasaPicasaPublisher* self) {
 	gboolean _tmp0_ = FALSE;
-#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
-#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!_tmp0_) {
-#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 1593 "PicasaPublishing.c"
+#line 1535 "PicasaPublishing.c"
 	}
-#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:189: EVENT: user clicked 'Logout' in the publish" \
+#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_debug ("PicasaPublishing.vala:185: EVENT: user clicked 'Logout' in the publish" \
 "ing options pane.");
-#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_rest_support_google_publisher_do_logout (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 1599 "PicasaPublishing.c"
+#line 1541 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_picasa_publisher_on_publishing_options_publish (PublishingPicasaPicasaPublisher* self) {
 	gboolean _tmp0_ = FALSE;
 	PublishingPicasaPublishingParameters* _tmp1_ = NULL;
-	PublishingPicasaPublishingParameters* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
-#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!_tmp0_) {
-#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 1616 "PicasaPublishing.c"
+#line 1556 "PicasaPublishing.c"
 	}
-#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:198: EVENT: user clicked 'Publish' in the publis" \
+#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_debug ("PicasaPublishing.vala:194: EVENT: user clicked 'Publish' in the publis" \
 "hing options pane.");
-#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = self->priv->publishing_parameters;
-#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_save_parameters_to_configuration_system (self, _tmp1_);
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp2_ = self->priv->publishing_parameters;
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp3_ = publishing_picasa_publishing_parameters_is_to_new_album (_tmp2_);
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (_tmp3_) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		publishing_picasa_picasa_publisher_do_create_album (self);
-#line 1632 "PicasaPublishing.c"
-	} else {
-#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		publishing_picasa_picasa_publisher_do_upload (self);
-#line 1636 "PicasaPublishing.c"
-	}
-}
-
-
-static void _publishing_picasa_picasa_publisher_on_album_creation_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_picasa_picasa_publisher_on_album_creation_complete ((PublishingPicasaPicasaPublisher*) self, _sender);
-#line 1644 "PicasaPublishing.c"
-}
-
-
-static void _publishing_picasa_picasa_publisher_on_album_creation_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_picasa_picasa_publisher_on_album_creation_error ((PublishingPicasaPicasaPublisher*) self, _sender, err);
-#line 1651 "PicasaPublishing.c"
-}
-
-
-static gpointer _publishing_rest_support_transaction_ref0 (gpointer self) {
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	return self ? publishing_rest_support_transaction_ref (self) : NULL;
-#line 1658 "PicasaPublishing.c"
-}
-
-
-static gchar* _publishing_picasa_album_directory_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self) {
-	gchar* result;
-	result = publishing_picasa_album_directory_transaction_validate_xml (doc);
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	return result;
-#line 1667 "PicasaPublishing.c"
-}
-
-
-static void publishing_picasa_picasa_publisher_on_album_creation_complete (PublishingPicasaPicasaPublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	PublishingPicasaAlbumCreationTransaction* downcast_txn = NULL;
-	PublishingRESTSupportTransaction* _tmp5_ = NULL;
-	PublishingPicasaAlbumCreationTransaction* _tmp6_ = NULL;
-	PublishingRESTSupportXmlDocument* response_doc = NULL;
-	PublishingPicasaAlbum** response_albums = NULL;
-	gint response_albums_length1 = 0;
-	gint _response_albums_size_ = 0;
-	PublishingPicasaAlbum** _tmp24_ = NULL;
-	gint _tmp24__length1 = 0;
-	PublishingPicasaPublishingParameters* _tmp28_ = NULL;
-	PublishingPicasaAlbum** _tmp29_ = NULL;
-	gint _tmp29__length1 = 0;
-	PublishingPicasaAlbum* _tmp30_ = NULL;
-	const gchar* _tmp31_ = NULL;
-	GError * _inner_error_ = NULL;
-#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
-#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = txn;
-#line 210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_album_creation_complete_publishing_rest_support_transaction_completed, self);
-#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp2_ = txn;
-#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_album_creation_error_publishing_rest_support_transaction_network_error, self);
-#line 213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp4_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (!_tmp4_) {
-#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		return;
-#line 1714 "PicasaPublishing.c"
-	}
-#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:216: EVENT: finished creating album on remote se" \
-"rver.");
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp5_ = txn;
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp6_ = _publishing_rest_support_transaction_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_PICASA_TYPE_ALBUM_CREATION_TRANSACTION, PublishingPicasaAlbumCreationTransaction));
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	downcast_txn = _tmp6_;
-#line 1724 "PicasaPublishing.c"
-	{
-		PublishingRESTSupportXmlDocument* _tmp7_ = NULL;
-		PublishingPicasaAlbumCreationTransaction* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp11_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp12_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp13_ = NULL;
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp8_ = downcast_txn;
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp9_ = publishing_rest_support_transaction_get_response (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp10_ = _tmp9_;
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp11_ = publishing_rest_support_xml_document_parse_string (_tmp10_, _publishing_picasa_album_directory_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp12_ = _tmp11_;
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_g_free0 (_tmp10_);
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp7_ = _tmp12_;
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 1751 "PicasaPublishing.c"
-				goto __catch7_spit_publishing_publishing_error;
-			}
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_publishing_rest_support_transaction_unref0 (downcast_txn);
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.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 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			g_clear_error (&_inner_error_);
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			return;
-#line 1764 "PicasaPublishing.c"
-		}
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp13_ = _tmp7_;
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp7_ = NULL;
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		response_doc = _tmp13_;
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_publishing_rest_support_xml_document_unref0 (_tmp7_);
-#line 1776 "PicasaPublishing.c"
-	}
-	goto __finally7;
-	__catch7_spit_publishing_publishing_error:
-	{
-		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp14_ = NULL;
-		GError* _tmp15_ = NULL;
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		err = _inner_error_;
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_inner_error_ = NULL;
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp14_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp15_ = err;
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp14_, _tmp15_);
-#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_g_error_free0 (err);
-#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_publishing_rest_support_transaction_unref0 (downcast_txn);
-#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		return;
-#line 1802 "PicasaPublishing.c"
-	}
-	__finally7:
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_publishing_rest_support_transaction_unref0 (downcast_txn);
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.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 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		g_clear_error (&_inner_error_);
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		return;
-#line 1817 "PicasaPublishing.c"
-	}
-	{
-		PublishingPicasaAlbum** _tmp16_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp17_ = NULL;
-		xmlNode* _tmp18_ = NULL;
-		gint _tmp19_ = 0;
-		PublishingPicasaAlbum** _tmp20_ = NULL;
-		gint _tmp16__length1 = 0;
-		gint __tmp16__size_ = 0;
-		PublishingPicasaAlbum** _tmp21_ = NULL;
-		gint _tmp21__length1 = 0;
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp17_ = response_doc;
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp18_ = publishing_rest_support_xml_document_get_root_node (_tmp17_);
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp20_ = publishing_picasa_picasa_publisher_extract_albums_helper (self, _tmp18_, &_tmp19_, &_inner_error_);
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp16_ = _tmp20_;
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp16__length1 = _tmp19_;
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		__tmp16__size_ = _tmp16__length1;
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 1845 "PicasaPublishing.c"
-				goto __catch8_spit_publishing_publishing_error;
-			}
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			response_albums = (_vala_array_free (response_albums, response_albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_publishing_rest_support_transaction_unref0 (downcast_txn);
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.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 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			g_clear_error (&_inner_error_);
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			return;
-#line 1860 "PicasaPublishing.c"
-		}
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp21_ = _tmp16_;
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp21__length1 = _tmp16__length1;
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp16_ = NULL;
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp16__length1 = 0;
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		response_albums = (_vala_array_free (response_albums, response_albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		response_albums = _tmp21_;
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		response_albums_length1 = _tmp21__length1;
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_response_albums_size_ = response_albums_length1;
-#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp16_ = (_vala_array_free (_tmp16_, _tmp16__length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 1880 "PicasaPublishing.c"
-	}
-	goto __finally8;
-	__catch8_spit_publishing_publishing_error:
-	{
-		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp22_ = NULL;
-		GError* _tmp23_ = NULL;
-#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		err = _inner_error_;
-#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_inner_error_ = NULL;
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp22_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp23_ = err;
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp22_, _tmp23_);
-#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_g_error_free0 (err);
-#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		response_albums = (_vala_array_free (response_albums, response_albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_publishing_rest_support_transaction_unref0 (downcast_txn);
-#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		return;
-#line 1908 "PicasaPublishing.c"
-	}
-	__finally8:
-#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		response_albums = (_vala_array_free (response_albums, response_albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_publishing_rest_support_transaction_unref0 (downcast_txn);
-#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.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 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		g_clear_error (&_inner_error_);
-#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		return;
-#line 1925 "PicasaPublishing.c"
-	}
-#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp24_ = response_albums;
-#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp24__length1 = response_albums_length1;
-#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (_tmp24__length1 != 1) {
-#line 1933 "PicasaPublishing.c"
-		SpitPublishingPluginHost* _tmp25_ = NULL;
-		GError* _tmp26_ = NULL;
-		GError* _tmp27_ = NULL;
-#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp25_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp26_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "album " "creation transaction responses must contain one and only one album dir" \
-"ectory " "entry");
-#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp27_ = _tmp26_;
-#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp25_, _tmp27_);
-#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_g_error_free0 (_tmp27_);
-#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		response_albums = (_vala_array_free (response_albums, response_albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_publishing_rest_support_transaction_unref0 (downcast_txn);
-#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		return;
-#line 1955 "PicasaPublishing.c"
-	}
-#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp28_ = self->priv->publishing_parameters;
-#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp29_ = response_albums;
-#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp29__length1 = response_albums_length1;
-#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp30_ = _tmp29_[0];
-#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp31_ = _tmp30_->url;
-#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_picasa_publishing_parameters_set_target_album_entry_url (_tmp28_, _tmp31_);
-#line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_do_upload (self);
-#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	response_albums = (_vala_array_free (response_albums, response_albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_publishing_rest_support_transaction_unref0 (downcast_txn);
-#line 1977 "PicasaPublishing.c"
-}
-
-
-static void publishing_picasa_picasa_publisher_on_album_creation_error (PublishingPicasaPicasaPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	PublishingRESTSupportTransaction* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	SpitPublishingPluginHost* _tmp8_ = NULL;
-	GError* _tmp9_ = NULL;
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn));
-#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = bad_txn;
-#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_album_creation_complete_publishing_rest_support_transaction_completed, self);
-#line 251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp2_ = bad_txn;
-#line 251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_album_creation_error_publishing_rest_support_transaction_network_error, self);
-#line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp4_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (!_tmp4_) {
-#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		return;
-#line 2014 "PicasaPublishing.c"
-	}
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp5_ = bad_txn;
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp6_ = publishing_rest_support_transaction_get_response (_tmp5_);
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp7_ = _tmp6_;
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:256: EVENT: creating album on remote server fail" \
-"ed; response = '%s'.", _tmp7_);
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (_tmp7_);
-#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp8_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp9_ = err;
-#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	spit_publishing_plugin_host_post_error (_tmp8_, _tmp9_);
-#line 2032 "PicasaPublishing.c"
+#line 1566 "PicasaPublishing.c"
 }
 
 
@@ -2061,52 +1584,52 @@ static void publishing_picasa_picasa_publisher_on_upload_status_updated (Publish
 	void* _tmp3__target = NULL;
 	gint _tmp4_ = 0;
 	gdouble _tmp5_ = 0.0;
-#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!_tmp0_) {
-#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2053 "PicasaPublishing.c"
+#line 1587 "PicasaPublishing.c"
 	}
-#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = completed_fraction;
-#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:266: EVENT: uploader reports upload %.2f percent" \
+#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_debug ("PicasaPublishing.vala:205: EVENT: uploader reports upload %.2f percent" \
 " complete.", 100.0 * _tmp1_);
-#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = self->priv->progress_reporter;
-#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2__target = self->priv->progress_reporter_target;
-#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_vala_assert (_tmp2_ != NULL, "progress_reporter != null");
-#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp3_ = self->priv->progress_reporter;
-#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp3__target = self->priv->progress_reporter_target;
-#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4_ = file_number;
-#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp5_ = completed_fraction;
-#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 2075 "PicasaPublishing.c"
+#line 1609 "PicasaPublishing.c"
 }
 
 
 static void _publishing_picasa_picasa_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) {
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_on_upload_complete ((PublishingPicasaPicasaPublisher*) self, _sender, num_photos_published);
-#line 2082 "PicasaPublishing.c"
+#line 1616 "PicasaPublishing.c"
 }
 
 
 static void _publishing_picasa_picasa_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) {
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_on_upload_error ((PublishingPicasaPicasaPublisher*) self, _sender, err);
-#line 2089 "PicasaPublishing.c"
+#line 1623 "PicasaPublishing.c"
 }
 
 
@@ -2117,38 +1640,38 @@ static void publishing_picasa_picasa_publisher_on_upload_complete (PublishingPic
 	guint _tmp3_ = 0U;
 	PublishingRESTSupportBatchUploader* _tmp4_ = NULL;
 	guint _tmp5_ = 0U;
-#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
-#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!_tmp0_) {
-#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2110 "PicasaPublishing.c"
+#line 1644 "PicasaPublishing.c"
 	}
-#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = num_published;
-#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:278: EVENT: uploader reports upload complete; %d" \
+#line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_debug ("PicasaPublishing.vala:217: EVENT: uploader reports upload complete; %d" \
 " items published.", _tmp1_);
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = uploader;
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4_ = uploader;
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp5_, NULL, FALSE);
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
-#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_do_show_success_pane (self);
-#line 2130 "PicasaPublishing.c"
+#line 1664 "PicasaPublishing.c"
 }
 
 
@@ -2162,65 +1685,44 @@ static void publishing_picasa_picasa_publisher_on_upload_error (PublishingPicasa
 	guint _tmp6_ = 0U;
 	SpitPublishingPluginHost* _tmp7_ = NULL;
 	GError* _tmp8_ = NULL;
-#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
-#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
-#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!_tmp0_) {
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2154 "PicasaPublishing.c"
+#line 1688 "PicasaPublishing.c"
 	}
-#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = err;
-#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = _tmp1_->message;
-#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:291: EVENT: uploader reports upload error = '%s'" \
+#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_debug ("PicasaPublishing.vala:230: EVENT: uploader reports upload error = '%s'" \
 ".", _tmp2_);
-#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp3_ = uploader;
-#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp4_, NULL, FALSE);
-#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
-#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp5_ = uploader;
-#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp6_, NULL, FALSE);
-#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp5_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
-#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp7_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp8_ = err;
-#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 2180 "PicasaPublishing.c"
-}
-
-
-static void _publishing_picasa_picasa_publisher_on_service_welcome_login_spit_publishing_login_callback (gpointer self) {
-#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_picasa_picasa_publisher_on_service_welcome_login ((PublishingPicasaPicasaPublisher*) self);
-#line 2187 "PicasaPublishing.c"
-}
-
-
-static void publishing_picasa_picasa_publisher_do_show_service_welcome_pane (PublishingPicasaPicasaPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:300: ACTION: showing service welcome pane.");
-#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	spit_publishing_plugin_host_install_welcome_pane (_tmp0_, PUBLISHING_PICASA_SERVICE_WELCOME_MESSAGE, _publishing_picasa_picasa_publisher_on_service_welcome_login_spit_publishing_login_callback, self);
-#line 2201 "PicasaPublishing.c"
+#line 1714 "PicasaPublishing.c"
 }
 
 
@@ -2233,104 +1735,113 @@ static void publishing_picasa_picasa_publisher_do_fetch_account_information (Pub
 	PublishingPicasaAlbumDirectoryTransaction* _tmp4_ = NULL;
 	PublishingPicasaAlbumDirectoryTransaction* _tmp5_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:306: ACTION: fetching account and album informat" \
+#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_debug ("PicasaPublishing.vala:239: ACTION: fetching account and album informat" \
 "ion.");
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	spit_publishing_plugin_host_install_account_fetch_wait_pane (_tmp0_);
-#line 309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp1_, TRUE);
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = publishing_rest_support_google_publisher_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp3_ = _tmp2_;
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4_ = publishing_picasa_album_directory_transaction_new (_tmp3_);
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp5_ = _tmp4_;
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_rest_support_session_unref0 (_tmp3_);
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	directory_trans = _tmp5_;
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_picasa_picasa_publisher_on_initial_album_fetch_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_picasa_picasa_publisher_on_initial_album_fetch_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 2242 "PicasaPublishing.c"
+#line 1755 "PicasaPublishing.c"
 	{
-#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2250 "PicasaPublishing.c"
-				goto __catch9_spit_publishing_publishing_error;
+#line 1763 "PicasaPublishing.c"
+				goto __catch6_spit_publishing_publishing_error;
 			}
-#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (directory_trans);
-#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.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 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return;
-#line 2261 "PicasaPublishing.c"
+#line 1774 "PicasaPublishing.c"
 		}
 	}
-	goto __finally9;
-	__catch9_spit_publishing_publishing_error:
+	goto __finally6;
+	__catch6_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		err = _inner_error_;
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_inner_error_ = NULL;
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp6_ = err;
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_picasa_publisher_on_initial_album_fetch_error (self, G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp6_);
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_error_free0 (err);
-#line 2279 "PicasaPublishing.c"
+#line 1792 "PicasaPublishing.c"
 	}
-	__finally9:
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	__finally6:
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_publishing_rest_support_transaction_unref0 (directory_trans);
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.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 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2292 "PicasaPublishing.c"
+#line 1805 "PicasaPublishing.c"
 	}
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (directory_trans);
-#line 2296 "PicasaPublishing.c"
+#line 1809 "PicasaPublishing.c"
+}
+
+
+static gchar* _publishing_picasa_album_directory_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self) {
+	gchar* result;
+	result = publishing_picasa_album_directory_transaction_validate_xml (doc);
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	return result;
+#line 1818 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_picasa_publisher_do_parse_and_display_account_information (PublishingPicasaPicasaPublisher* self, PublishingPicasaAlbumDirectoryTransaction* transaction) {
 	PublishingRESTSupportXmlDocument* response_doc = NULL;
 	GError * _inner_error_ = NULL;
-#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
-#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_ALBUM_DIRECTORY_TRANSACTION (transaction));
-#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:327: ACTION: parsing account and album informati" \
+#line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_debug ("PicasaPublishing.vala:260: ACTION: parsing account and album informati" \
 "on from server response XML");
-#line 2309 "PicasaPublishing.c"
+#line 1831 "PicasaPublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* _tmp0_ = NULL;
 		PublishingPicasaAlbumDirectoryTransaction* _tmp1_ = NULL;
@@ -2339,85 +1850,85 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info
 		PublishingRESTSupportXmlDocument* _tmp4_ = NULL;
 		PublishingRESTSupportXmlDocument* _tmp5_ = NULL;
 		PublishingRESTSupportXmlDocument* _tmp6_ = NULL;
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp1_ = transaction;
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp2_ = publishing_rest_support_transaction_get_response (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp3_ = _tmp2_;
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp4_ = publishing_rest_support_xml_document_parse_string (_tmp3_, _publishing_picasa_album_directory_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp5_ = _tmp4_;
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_free0 (_tmp3_);
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp0_ = _tmp5_;
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2336 "PicasaPublishing.c"
-				goto __catch10_spit_publishing_publishing_error;
+#line 1858 "PicasaPublishing.c"
+				goto __catch7_spit_publishing_publishing_error;
 			}
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.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 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return;
-#line 2347 "PicasaPublishing.c"
+#line 1869 "PicasaPublishing.c"
 		}
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp6_ = _tmp0_;
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp0_ = NULL;
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		response_doc = _tmp6_;
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (_tmp0_);
-#line 2359 "PicasaPublishing.c"
+#line 1881 "PicasaPublishing.c"
 	}
-	goto __finally10;
-	__catch10_spit_publishing_publishing_error:
+	goto __finally7;
+	__catch7_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp7_ = NULL;
 		GError* _tmp8_ = NULL;
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		err = _inner_error_;
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_inner_error_ = NULL;
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp7_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp8_ = err;
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_error_free0 (err);
-#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2383 "PicasaPublishing.c"
+#line 1905 "PicasaPublishing.c"
 	}
-	__finally10:
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	__finally7:
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.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 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2396 "PicasaPublishing.c"
+#line 1918 "PicasaPublishing.c"
 	}
 	{
 		PublishingPicasaAlbum** _tmp9_ = NULL;
@@ -2428,99 +1939,99 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info
 		gint _tmp9__length1 = 0;
 		gint __tmp9__size_ = 0;
 		PublishingPicasaPublishingParameters* _tmp14_ = NULL;
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp10_ = response_doc;
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp11_ = publishing_rest_support_xml_document_get_root_node (_tmp10_);
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp13_ = publishing_picasa_picasa_publisher_extract_albums_helper (self, _tmp11_, &_tmp12_, &_inner_error_);
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp9_ = _tmp13_;
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp9__length1 = _tmp12_;
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		__tmp9__size_ = _tmp9__length1;
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2423 "PicasaPublishing.c"
-				goto __catch11_spit_publishing_publishing_error;
+#line 1945 "PicasaPublishing.c"
+				goto __catch8_spit_publishing_publishing_error;
 			}
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.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 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return;
-#line 2434 "PicasaPublishing.c"
+#line 1956 "PicasaPublishing.c"
 		}
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp14_ = self->priv->publishing_parameters;
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_publishing_parameters_set_albums (_tmp14_, _tmp9_, _tmp9__length1);
-#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp9_ = (_vala_array_free (_tmp9_, _tmp9__length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 2442 "PicasaPublishing.c"
+#line 1964 "PicasaPublishing.c"
 	}
-	goto __finally11;
-	__catch11_spit_publishing_publishing_error:
+	goto __finally8;
+	__catch8_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp15_ = NULL;
 		GError* _tmp16_ = NULL;
-#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		err = _inner_error_;
-#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_inner_error_ = NULL;
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp15_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp16_ = err;
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp15_, _tmp16_);
-#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_error_free0 (err);
-#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2466 "PicasaPublishing.c"
+#line 1988 "PicasaPublishing.c"
 	}
-	__finally11:
-#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	__finally8:
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.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 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2479 "PicasaPublishing.c"
+#line 2001 "PicasaPublishing.c"
 	}
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_do_show_publishing_options_pane (self);
-#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 2485 "PicasaPublishing.c"
+#line 2007 "PicasaPublishing.c"
 }
 
 
 static void _publishing_picasa_picasa_publisher_on_publishing_options_publish_publishing_picasa_publishing_options_pane_publish (PublishingPicasaPublishingOptionsPane* _sender, gpointer self) {
-#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_on_publishing_options_publish ((PublishingPicasaPicasaPublisher*) self);
-#line 2492 "PicasaPublishing.c"
+#line 2014 "PicasaPublishing.c"
 }
 
 
 static void _publishing_picasa_picasa_publisher_on_publishing_options_logout_publishing_picasa_publishing_options_pane_logout (PublishingPicasaPublishingOptionsPane* _sender, gpointer self) {
-#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_on_publishing_options_logout ((PublishingPicasaPicasaPublisher*) self);
-#line 2499 "PicasaPublishing.c"
+#line 2021 "PicasaPublishing.c"
 }
 
 
@@ -2530,36 +2041,38 @@ static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane (
 	PublishingPicasaPublishingOptionsPane* opts_pane = NULL;
 	GtkBuilder* _tmp8_ = NULL;
 	PublishingPicasaPublishingParameters* _tmp9_ = NULL;
-	PublishingPicasaPublishingOptionsPane* _tmp10_ = NULL;
-	PublishingPicasaPublishingOptionsPane* _tmp11_ = NULL;
+	SpitPublishingAuthenticator* _tmp10_ = NULL;
+	gboolean _tmp11_ = FALSE;
 	PublishingPicasaPublishingOptionsPane* _tmp12_ = NULL;
-	SpitPublishingPluginHost* _tmp13_ = NULL;
+	PublishingPicasaPublishingOptionsPane* _tmp13_ = NULL;
 	PublishingPicasaPublishingOptionsPane* _tmp14_ = NULL;
 	SpitPublishingPluginHost* _tmp15_ = NULL;
+	PublishingPicasaPublishingOptionsPane* _tmp16_ = NULL;
+	SpitPublishingPluginHost* _tmp17_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
-#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:349: ACTION: showing publishing options pane.");
-#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_debug ("PicasaPublishing.vala:282: ACTION: showing publishing options pane.");
+#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = gtk_builder_new ();
-#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	builder = _tmp0_;
-#line 2524 "PicasaPublishing.c"
+#line 2048 "PicasaPublishing.c"
 	{
 		GtkBuilder* _tmp1_ = NULL;
-#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp1_ = builder;
-#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		gtk_builder_add_from_resource (_tmp1_, PLUGIN_RESOURCE_PATH "/" "picasa_publishing_options_pane.ui", &_inner_error_);
-#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2533 "PicasaPublishing.c"
-			goto __catch12_g_error;
+#line 2057 "PicasaPublishing.c"
+			goto __catch9_g_error;
 		}
 	}
-	goto __finally12;
-	__catch12_g_error:
+	goto __finally9;
+	__catch9_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp2_ = NULL;
@@ -2568,212 +2081,92 @@ static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane (
 		const gchar* _tmp5_ = NULL;
 		GError* _tmp6_ = NULL;
 		GError* _tmp7_ = NULL;
-#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		e = _inner_error_;
-#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_inner_error_ = NULL;
-#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp2_ = e;
-#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp3_ = _tmp2_->message;
-#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		g_warning ("PicasaPublishing.vala:358: Could not parse UI file! Error: %s.", _tmp3_);
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		g_warning ("PicasaPublishing.vala:288: Could not parse UI file! Error: %s.", _tmp3_);
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_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"
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp5_ = _ ("A file required for publishing is unavailable. Publishing to Picasa ca" \
 "n’t continue.");
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 289 "/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"
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp7_ = _tmp6_;
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp4_, _tmp7_);
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_error_free0 (_tmp7_);
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_error_free0 (e);
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_object_unref0 (builder);
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2575 "PicasaPublishing.c"
+#line 2099 "PicasaPublishing.c"
 	}
-	__finally12:
-#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	__finally9:
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_object_unref0 (builder);
-#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.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 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2588 "PicasaPublishing.c"
+#line 2112 "PicasaPublishing.c"
 	}
-#line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp8_ = builder;
-#line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp9_ = self->priv->publishing_parameters;
-#line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp10_ = publishing_picasa_publishing_options_pane_new (_tmp8_, _tmp9_);
-#line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	opts_pane = _tmp10_;
-#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp11_ = opts_pane;
-#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_connect_object (_tmp11_, "publish", (GCallback) _publishing_picasa_picasa_publisher_on_publishing_options_publish_publishing_picasa_publishing_options_pane_publish, self, 0);
-#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp12_ = opts_pane;
-#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_connect_object (_tmp12_, "logout", (GCallback) _publishing_picasa_picasa_publisher_on_publishing_options_logout_publishing_picasa_publishing_options_pane_logout, self, 0);
-#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp13_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp10_ = self->priv->authenticator;
+#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp11_ = spit_publishing_authenticator_can_logout (_tmp10_);
+#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp12_ = publishing_picasa_publishing_options_pane_new (_tmp8_, _tmp9_, _tmp11_);
+#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	opts_pane = _tmp12_;
+#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp13_ = opts_pane;
+#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_signal_connect_object (_tmp13_, "publish", (GCallback) _publishing_picasa_picasa_publisher_on_publishing_options_publish_publishing_picasa_publishing_options_pane_publish, self, 0);
+#line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp14_ = opts_pane;
-#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	spit_publishing_plugin_host_install_dialog_pane (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_signal_connect_object (_tmp14_, "logout", (GCallback) _publishing_picasa_picasa_publisher_on_publishing_options_logout_publishing_picasa_publishing_options_pane_logout, self, 0);
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp15_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp15_, FALSE);
-#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp16_ = opts_pane;
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	spit_publishing_plugin_host_install_dialog_pane (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp17_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	spit_publishing_plugin_host_set_service_locked (_tmp17_, FALSE);
+#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (opts_pane);
-#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (builder);
-#line 2620 "PicasaPublishing.c"
-}
-
-
-static void publishing_picasa_picasa_publisher_do_create_album (PublishingPicasaPicasaPublisher* self) {
-	PublishingPicasaPublishingParameters* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	PublishingPicasaPublishingParameters* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	SpitPublishingPluginHost* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	SpitPublishingPluginHost* _tmp7_ = NULL;
-	PublishingPicasaAlbumCreationTransaction* creation_trans = NULL;
-	PublishingRESTSupportGoogleSession* _tmp8_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp9_ = NULL;
-	PublishingPicasaPublishingParameters* _tmp10_ = NULL;
-	PublishingPicasaAlbumCreationTransaction* _tmp11_ = NULL;
-	PublishingPicasaAlbumCreationTransaction* _tmp12_ = NULL;
-	GError * _inner_error_ = NULL;
-#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
-#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = self->priv->publishing_parameters;
-#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp1_ = publishing_picasa_publishing_parameters_is_to_new_album (_tmp0_);
-#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_vala_assert (_tmp1_, "publishing_parameters.is_to_new_album()");
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp2_ = self->priv->publishing_parameters;
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp3_ = publishing_picasa_publishing_parameters_get_target_album_name (_tmp2_);
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp4_ = _tmp3_;
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:376: ACTION: creating new album '%s' on remote s" \
-"erver.", _tmp4_);
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (_tmp4_);
-#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…");
-#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"
-	_tmp7_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp7_, TRUE);
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp8_ = publishing_rest_support_google_publisher_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp9_ = _tmp8_;
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp10_ = self->priv->publishing_parameters;
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp11_ = publishing_picasa_album_creation_transaction_new (_tmp9_, _tmp10_);
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp12_ = _tmp11_;
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_publishing_rest_support_session_unref0 (_tmp9_);
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	creation_trans = _tmp12_;
-#line 385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (creation_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_picasa_picasa_publisher_on_album_creation_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (creation_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_picasa_picasa_publisher_on_album_creation_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 2686 "PicasaPublishing.c"
-	{
-#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (creation_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2694 "PicasaPublishing.c"
-				goto __catch13_spit_publishing_publishing_error;
-			}
-#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_publishing_rest_support_transaction_unref0 (creation_trans);
-#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.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 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			g_clear_error (&_inner_error_);
-#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			return;
-#line 2705 "PicasaPublishing.c"
-		}
-	}
-	goto __finally13;
-	__catch13_spit_publishing_publishing_error:
-	{
-		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp13_ = NULL;
-		GError* _tmp14_ = NULL;
-#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		err = _inner_error_;
-#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_inner_error_ = NULL;
-#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp13_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp14_ = err;
-#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp13_, _tmp14_);
-#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_g_error_free0 (err);
-#line 2726 "PicasaPublishing.c"
-	}
-	__finally13:
-#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_publishing_rest_support_transaction_unref0 (creation_trans);
-#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.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 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		g_clear_error (&_inner_error_);
-#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		return;
-#line 2739 "PicasaPublishing.c"
-	}
-#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_publishing_rest_support_transaction_unref0 (creation_trans);
-#line 2743 "PicasaPublishing.c"
+#line 2148 "PicasaPublishing.c"
 }
 
 
 static void _publishing_picasa_picasa_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
-#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_on_upload_status_updated ((PublishingPicasaPicasaPublisher*) self, file_number, fraction_complete);
-#line 2750 "PicasaPublishing.c"
+#line 2155 "PicasaPublishing.c"
 }
 
 
@@ -2805,113 +2198,113 @@ static void publishing_picasa_picasa_publisher_do_upload (PublishingPicasaPicasa
 	PublishingPicasaUploader* _tmp19_ = NULL;
 	PublishingPicasaUploader* _tmp20_ = NULL;
 	PublishingPicasaUploader* _tmp21_ = NULL;
-#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
-#line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:395: ACTION: uploading media items to remote ser" \
+#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_debug ("PicasaPublishing.vala:304: ACTION: uploading media items to remote ser" \
 "ver.");
-#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = self->priv->publishing_parameters;
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp3_ = publishing_picasa_publishing_parameters_get_major_axis_size_pixels (_tmp2_);
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4_ = self->priv->publishing_parameters;
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp5_ = publishing_picasa_publishing_parameters_get_strip_metadata (_tmp4_);
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp8_ = spit_publishing_plugin_host_serialize_publishables (_tmp1_, _tmp3_, _tmp5_, &_tmp6_, &_tmp7_);
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->progress_reporter = NULL;
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->progress_reporter_target = NULL;
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->progress_reporter = _tmp8_;
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->progress_reporter_target = _tmp6_;
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = _tmp7_;
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp9_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!_tmp9_) {
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2822 "PicasaPublishing.c"
+#line 2227 "PicasaPublishing.c"
 	}
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp10_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp12_ = spit_publishing_plugin_host_get_publishables (_tmp10_, &_tmp11_);
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishables = _tmp12_;
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishables_length1 = _tmp11_;
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishables_size_ = publishables_length1;
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp13_ = publishing_rest_support_google_publisher_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp14_ = _tmp13_;
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp15_ = publishables;
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp15__length1 = publishables_length1;
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp16_ = self->priv->publishing_parameters;
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp17_ = publishing_picasa_uploader_new (_tmp14_, _tmp15_, _tmp15__length1, _tmp16_);
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp18_ = _tmp17_;
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_rest_support_session_unref0 (_tmp14_);
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	uploader = _tmp18_;
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp19_ = uploader;
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-complete", (GCallback) _publishing_picasa_picasa_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self, 0);
-#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp20_ = uploader;
-#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-error", (GCallback) _publishing_picasa_picasa_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self, 0);
-#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp21_ = uploader;
-#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_rest_support_batch_uploader_upload (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), _publishing_picasa_picasa_publisher_on_upload_status_updated_spit_publishing_progress_callback, self);
-#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_rest_support_batch_uploader_unref0 (uploader);
-#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 2868 "PicasaPublishing.c"
+#line 2273 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_picasa_publisher_do_show_success_pane (PublishingPicasaPicasaPublisher* self) {
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	SpitPublishingPluginHost* _tmp1_ = NULL;
-#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:420: ACTION: showing success pane.");
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_debug ("PicasaPublishing.vala:329: ACTION: showing success pane.");
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
-#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	spit_publishing_plugin_host_install_success_pane (_tmp1_);
-#line 2887 "PicasaPublishing.c"
+#line 2292 "PicasaPublishing.c"
 }
 
 
@@ -2919,30 +2312,39 @@ static void publishing_picasa_picasa_publisher_real_do_logout (PublishingRESTSup
 	PublishingPicasaPicasaPublisher * self;
 	PublishingRESTSupportGoogleSession* _tmp0_ = NULL;
 	PublishingRESTSupportGoogleSession* _tmp1_ = NULL;
-	SpitPublishingPluginHost* _tmp2_ = NULL;
-#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	SpitPublishingAuthenticator* _tmp2_ = NULL;
+	gboolean _tmp3_ = FALSE;
+#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, PublishingPicasaPicasaPublisher);
-#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:427: ACTION: logging out user.");
-#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_debug ("PicasaPublishing.vala:336: ACTION: logging out user.");
+#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = publishing_rest_support_google_publisher_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = _tmp0_;
-#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_rest_support_google_session_deauthenticate (_tmp1_);
-#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_rest_support_session_unref0 (_tmp1_);
-#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (self->priv->refresh_token);
-#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->refresh_token = NULL;
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp2_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	spit_host_interface_unset_config_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "refresh_token");
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_picasa_picasa_publisher_do_show_service_welcome_pane (self);
-#line 2918 "PicasaPublishing.c"
+#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp2_ = self->priv->authenticator;
+#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp3_ = spit_publishing_authenticator_can_logout (_tmp2_);
+#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	if (_tmp3_) {
+#line 2320 "PicasaPublishing.c"
+		SpitPublishingAuthenticator* _tmp4_ = NULL;
+		SpitPublishingAuthenticator* _tmp5_ = NULL;
+#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp4_ = self->priv->authenticator;
+#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		spit_publishing_authenticator_logout (_tmp4_);
+#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp5_ = self->priv->authenticator;
+#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		spit_publishing_authenticator_authenticate (_tmp5_);
+#line 2331 "PicasaPublishing.c"
+	}
 }
 
 
@@ -2950,51 +2352,41 @@ static gboolean publishing_picasa_picasa_publisher_real_is_running (PublishingRE
 	PublishingPicasaPicasaPublisher * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, PublishingPicasaPicasaPublisher);
-#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = self->priv->running;
-#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = _tmp0_;
-#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 2934 "PicasaPublishing.c"
+#line 2348 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_picasa_publisher_real_start (PublishingRESTSupportGooglePublisher* base) {
 	PublishingPicasaPicasaPublisher * self;
 	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
-#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	SpitPublishingAuthenticator* _tmp1_ = NULL;
+#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, PublishingPicasaPicasaPublisher);
-#line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:442: PicasaPublisher: start( ) invoked.");
-#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_debug ("PicasaPublishing.vala:350: PicasaPublisher: start( ) invoked.");
+#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (_tmp0_) {
-#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2952 "PicasaPublishing.c"
+#line 2366 "PicasaPublishing.c"
 	}
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->running = TRUE;
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp1_ = self->priv->refresh_token;
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (_tmp1_ == NULL) {
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		publishing_picasa_picasa_publisher_do_show_service_welcome_pane (self);
-#line 2962 "PicasaPublishing.c"
-	} else {
-		const gchar* _tmp2_ = NULL;
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp2_ = self->priv->refresh_token;
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		publishing_rest_support_google_publisher_start_oauth_flow (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher), _tmp2_);
-#line 2969 "PicasaPublishing.c"
-	}
+#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp1_ = self->priv->authenticator;
+#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	spit_publishing_authenticator_authenticate (_tmp1_);
+#line 2374 "PicasaPublishing.c"
 }
 
 
@@ -3002,71 +2394,118 @@ static void publishing_picasa_picasa_publisher_real_stop (PublishingRESTSupportG
 	PublishingPicasaPicasaPublisher * self;
 	PublishingRESTSupportGoogleSession* _tmp0_ = NULL;
 	PublishingRESTSupportGoogleSession* _tmp1_ = NULL;
-#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, PublishingPicasaPicasaPublisher);
-#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:456: PicasaPublisher: stop( ) invoked.");
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_debug ("PicasaPublishing.vala:361: PicasaPublisher: stop( ) invoked.");
+#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = publishing_rest_support_google_publisher_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = _tmp0_;
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_rest_support_session_stop_transactions (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_rest_support_session_unref0 (_tmp1_);
-#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->running = FALSE;
-#line 2992 "PicasaPublishing.c"
+#line 2396 "PicasaPublishing.c"
+}
+
+
+static SpitPublishingAuthenticator* publishing_picasa_picasa_publisher_real_get_authenticator (PublishingRESTSupportGooglePublisher* base) {
+	PublishingPicasaPicasaPublisher * self;
+	SpitPublishingAuthenticator* result = NULL;
+	SpitPublishingAuthenticator* _tmp0_ = NULL;
+	SpitPublishingAuthenticator* _tmp5_ = NULL;
+	SpitPublishingAuthenticator* _tmp6_ = NULL;
+#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, PublishingPicasaPicasaPublisher);
+#line 369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp0_ = self->priv->authenticator;
+#line 369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	if (_tmp0_ == NULL) {
+#line 2412 "PicasaPublishing.c"
+		PublishingAuthenticatorFactory* _tmp1_ = NULL;
+		PublishingAuthenticatorFactory* _tmp2_ = NULL;
+		SpitPublishingPluginHost* _tmp3_ = NULL;
+		SpitPublishingAuthenticator* _tmp4_ = NULL;
+#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp1_ = publishing_authenticator_factory_get_instance ();
+#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp2_ = _tmp1_;
+#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp3_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp4_ = spit_publishing_authenticator_factory_create (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY, SpitPublishingAuthenticatorFactory), "picasa", _tmp3_);
+#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_g_object_unref0 (self->priv->authenticator);
+#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		self->priv->authenticator = _tmp4_;
+#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_g_object_unref0 (_tmp2_);
+#line 2431 "PicasaPublishing.c"
+	}
+#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp5_ = self->priv->authenticator;
+#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp6_ = _g_object_ref0 (_tmp5_);
+#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	result = _tmp6_;
+#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	return result;
+#line 2441 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_picasa_publisher_class_init (PublishingPicasaPicasaPublisherClass * klass) {
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_parent_class = g_type_class_peek_parent (klass);
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingPicasaPicasaPublisherPrivate));
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	((PublishingRESTSupportGooglePublisherClass *) klass)->on_login_flow_complete = publishing_picasa_picasa_publisher_real_on_login_flow_complete;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	((PublishingRESTSupportGooglePublisherClass *) klass)->do_logout = publishing_picasa_picasa_publisher_real_do_logout;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	((PublishingRESTSupportGooglePublisherClass *) klass)->is_running = publishing_picasa_picasa_publisher_real_is_running;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	((PublishingRESTSupportGooglePublisherClass *) klass)->start = publishing_picasa_picasa_publisher_real_start;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	((PublishingRESTSupportGooglePublisherClass *) klass)->stop = publishing_picasa_picasa_publisher_real_stop;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	((PublishingRESTSupportGooglePublisherClass *) klass)->get_authenticator = publishing_picasa_picasa_publisher_real_get_authenticator;
+#line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_picasa_picasa_publisher_finalize;
-#line 3013 "PicasaPublishing.c"
+#line 2464 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_picasa_publisher_instance_init (PublishingPicasaPicasaPublisher * self) {
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv = PUBLISHING_PICASA_PICASA_PUBLISHER_GET_PRIVATE (self);
-#line 3020 "PicasaPublishing.c"
+#line 2471 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_picasa_publisher_finalize (GObject* obj) {
 	PublishingPicasaPicasaPublisher * self;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, PublishingPicasaPicasaPublisher);
-#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 63 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
-#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 63 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->progress_reporter = NULL;
-#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 63 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->progress_reporter_target = NULL;
-#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 63 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 65 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_picasa_publishing_parameters_unref0 (self->priv->publishing_parameters);
-#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (self->priv->refresh_token);
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 65 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_g_object_unref0 (self->priv->authenticator);
+#line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	G_OBJECT_CLASS (publishing_picasa_picasa_publisher_parent_class)->finalize (obj);
-#line 3042 "PicasaPublishing.c"
+#line 2493 "PicasaPublishing.c"
 }
 
 
@@ -3088,248 +2527,248 @@ PublishingPicasaAlbum* publishing_picasa_album_construct (GType object_type, con
 	gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (url != NULL, NULL);
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = (PublishingPicasaAlbum*) g_type_create_instance (object_type);
-#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = name;
-#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->name);
-#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->name = _tmp1_;
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = url;
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->url);
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->url = _tmp3_;
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 3088 "PicasaPublishing.c"
+#line 2539 "PicasaPublishing.c"
 }
 
 
 PublishingPicasaAlbum* publishing_picasa_album_new (const gchar* name, const gchar* url) {
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return publishing_picasa_album_construct (PUBLISHING_PICASA_TYPE_ALBUM, name, url);
-#line 3095 "PicasaPublishing.c"
+#line 2546 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_value_album_init (GValue* value) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 3102 "PicasaPublishing.c"
+#line 2553 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_value_album_free_value (GValue* value) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_album_unref (value->data[0].v_pointer);
-#line 3111 "PicasaPublishing.c"
+#line 2562 "PicasaPublishing.c"
 	}
 }
 
 
 static void publishing_picasa_value_album_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_picasa_album_ref (src_value->data[0].v_pointer);
-#line 3121 "PicasaPublishing.c"
+#line 2572 "PicasaPublishing.c"
 	} else {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3125 "PicasaPublishing.c"
+#line 2576 "PicasaPublishing.c"
 	}
 }
 
 
 static gpointer publishing_picasa_value_album_peek_pointer (const GValue* value) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return value->data[0].v_pointer;
-#line 3133 "PicasaPublishing.c"
+#line 2584 "PicasaPublishing.c"
 }
 
 
 static gchar* publishing_picasa_value_album_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 3140 "PicasaPublishing.c"
+#line 2591 "PicasaPublishing.c"
 		PublishingPicasaAlbum* object;
 		object = collect_values[0].v_pointer;
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3147 "PicasaPublishing.c"
+#line 2598 "PicasaPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.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 3151 "PicasaPublishing.c"
+#line 2602 "PicasaPublishing.c"
 		}
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = publishing_picasa_album_ref (object);
-#line 3155 "PicasaPublishing.c"
+#line 2606 "PicasaPublishing.c"
 	} else {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 3159 "PicasaPublishing.c"
+#line 2610 "PicasaPublishing.c"
 	}
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return NULL;
-#line 3163 "PicasaPublishing.c"
+#line 2614 "PicasaPublishing.c"
 }
 
 
 static gchar* publishing_picasa_value_album_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingPicasaAlbum** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!object_p) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3174 "PicasaPublishing.c"
+#line 2625 "PicasaPublishing.c"
 	}
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = NULL;
-#line 3180 "PicasaPublishing.c"
+#line 2631 "PicasaPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3184 "PicasaPublishing.c"
+#line 2635 "PicasaPublishing.c"
 	} else {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = publishing_picasa_album_ref (value->data[0].v_pointer);
-#line 3188 "PicasaPublishing.c"
+#line 2639 "PicasaPublishing.c"
 	}
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return NULL;
-#line 3192 "PicasaPublishing.c"
+#line 2643 "PicasaPublishing.c"
 }
 
 
 GParamSpec* publishing_picasa_param_spec_album (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingPicasaParamSpecAlbum* spec;
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_PICASA_TYPE_ALBUM), NULL);
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 3206 "PicasaPublishing.c"
+#line 2657 "PicasaPublishing.c"
 }
 
 
 gpointer publishing_picasa_value_get_album (const GValue* value) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_TYPE_ALBUM), NULL);
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return value->data[0].v_pointer;
-#line 3215 "PicasaPublishing.c"
+#line 2666 "PicasaPublishing.c"
 }
 
 
 void publishing_picasa_value_set_album (GValue* value, gpointer v_object) {
 	PublishingPicasaAlbum* old;
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_TYPE_ALBUM));
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (v_object) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_PICASA_TYPE_ALBUM));
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_album_ref (value->data[0].v_pointer);
-#line 3235 "PicasaPublishing.c"
+#line 2686 "PicasaPublishing.c"
 	} else {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 3239 "PicasaPublishing.c"
+#line 2690 "PicasaPublishing.c"
 	}
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (old) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_album_unref (old);
-#line 3245 "PicasaPublishing.c"
+#line 2696 "PicasaPublishing.c"
 	}
 }
 
 
 void publishing_picasa_value_take_album (GValue* value, gpointer v_object) {
 	PublishingPicasaAlbum* old;
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_TYPE_ALBUM));
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (v_object) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_PICASA_TYPE_ALBUM));
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 3264 "PicasaPublishing.c"
+#line 2715 "PicasaPublishing.c"
 	} else {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 3268 "PicasaPublishing.c"
+#line 2719 "PicasaPublishing.c"
 	}
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (old) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_album_unref (old);
-#line 3274 "PicasaPublishing.c"
+#line 2725 "PicasaPublishing.c"
 	}
 }
 
 
 static void publishing_picasa_album_class_init (PublishingPicasaAlbumClass * klass) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_album_parent_class = g_type_class_peek_parent (klass);
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	((PublishingPicasaAlbumClass *) klass)->finalize = publishing_picasa_album_finalize;
-#line 3284 "PicasaPublishing.c"
+#line 2735 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_album_instance_init (PublishingPicasaAlbum * self) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->ref_count = 1;
-#line 3291 "PicasaPublishing.c"
+#line 2742 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_album_finalize (PublishingPicasaAlbum* obj) {
 	PublishingPicasaAlbum * self;
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PICASA_TYPE_ALBUM, PublishingPicasaAlbum);
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->name);
-#line 466 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->url);
-#line 3305 "PicasaPublishing.c"
+#line 2756 "PicasaPublishing.c"
 }
 
 
@@ -3350,24 +2789,24 @@ GType publishing_picasa_album_get_type (void) {
 gpointer publishing_picasa_album_ref (gpointer instance) {
 	PublishingPicasaAlbum* self;
 	self = instance;
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return instance;
-#line 3330 "PicasaPublishing.c"
+#line 2781 "PicasaPublishing.c"
 }
 
 
 void publishing_picasa_album_unref (gpointer instance) {
 	PublishingPicasaAlbum* self;
 	self = instance;
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		PUBLISHING_PICASA_ALBUM_GET_CLASS (self)->finalize (self);
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3343 "PicasaPublishing.c"
+#line 2794 "PicasaPublishing.c"
 	}
 }
 
@@ -3375,22 +2814,22 @@ void publishing_picasa_album_unref (gpointer instance) {
 PublishingPicasaAlbumDirectoryTransaction* publishing_picasa_album_directory_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session) {
 	PublishingPicasaAlbumDirectoryTransaction* self = NULL;
 	PublishingRESTSupportGoogleSession* _tmp0_ = NULL;
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
-#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = session;
-#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = (PublishingPicasaAlbumDirectoryTransaction*) publishing_rest_support_google_publisher_authenticated_transaction_construct (object_type, _tmp0_, PUBLISHING_PICASA_ALBUM_DIRECTORY_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 3359 "PicasaPublishing.c"
+#line 2810 "PicasaPublishing.c"
 }
 
 
 PublishingPicasaAlbumDirectoryTransaction* publishing_picasa_album_directory_transaction_new (PublishingRESTSupportGoogleSession* session) {
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return publishing_picasa_album_directory_transaction_construct (PUBLISHING_PICASA_TYPE_ALBUM_DIRECTORY_TRANSACTION, session);
-#line 3366 "PicasaPublishing.c"
+#line 2817 "PicasaPublishing.c"
 }
 
 
@@ -3402,58 +2841,58 @@ gchar* publishing_picasa_album_directory_transaction_validate_xml (PublishingRES
 	gboolean _tmp2_ = FALSE;
 	xmlNode* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
-#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL);
-#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = doc;
-#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = publishing_rest_support_xml_document_get_root_node (_tmp0_);
-#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	document_root = _tmp1_;
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp3_ = document_root;
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4_ = _tmp3_->name;
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (g_strcmp0 (_tmp4_, "feed") == 0) {
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp2_ = TRUE;
-#line 3394 "PicasaPublishing.c"
+#line 2845 "PicasaPublishing.c"
 	} else {
 		xmlNode* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp5_ = document_root;
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp6_ = _tmp5_->name;
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp2_ = g_strcmp0 (_tmp6_, "entry") == 0;
-#line 3404 "PicasaPublishing.c"
+#line 2855 "PicasaPublishing.c"
 	}
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (_tmp2_) {
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		result = NULL;
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return result;
-#line 3412 "PicasaPublishing.c"
+#line 2863 "PicasaPublishing.c"
 	} else {
 		gchar* _tmp7_ = NULL;
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp7_ = g_strdup ("response root node isn't a <feed> or <entry>");
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		result = _tmp7_;
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return result;
-#line 3421 "PicasaPublishing.c"
+#line 2872 "PicasaPublishing.c"
 	}
 }
 
 
 static void publishing_picasa_album_directory_transaction_class_init (PublishingPicasaAlbumDirectoryTransactionClass * klass) {
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_album_directory_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 3429 "PicasaPublishing.c"
+#line 2880 "PicasaPublishing.c"
 }
 
 
@@ -3473,113 +2912,17 @@ GType publishing_picasa_album_directory_transaction_get_type (void) {
 }
 
 
-PublishingPicasaAlbumCreationTransaction* publishing_picasa_album_creation_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session, PublishingPicasaPublishingParameters* parameters) {
-	PublishingPicasaAlbumCreationTransaction* self = NULL;
-	PublishingRESTSupportGoogleSession* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	PublishingPicasaPublishingParameters* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gchar* post_body = NULL;
-	PublishingPicasaPublishingParameters* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (parameters), NULL);
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = session;
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self = (PublishingPicasaAlbumCreationTransaction*) publishing_rest_support_google_publisher_authenticated_transaction_construct (object_type, _tmp0_, PUBLISHING_PICASA_ALBUM_CREATION_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp2_ = parameters;
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp3_ = publishing_picasa_publishing_parameters_is_new_album_public (_tmp2_);
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (_tmp3_) {
-#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp1_ = "public";
-#line 3479 "PicasaPublishing.c"
-	} else {
-#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp1_ = "private";
-#line 3483 "PicasaPublishing.c"
-	}
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp4_ = parameters;
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp5_ = publishing_picasa_publishing_parameters_get_target_album_name (_tmp4_);
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp6_ = _tmp5_;
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp7_ = publishing_rest_support_decimal_entity_encode (_tmp6_);
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp8_ = _tmp7_;
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp9_ = g_strdup_printf (PUBLISHING_PICASA_ALBUM_CREATION_TRANSACTION_ALBUM_ENTRY_TEMPLATE, _tmp8_, _tmp1_);
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp10_ = _tmp9_;
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (_tmp8_);
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (_tmp6_);
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	post_body = _tmp10_;
-#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_rest_support_transaction_set_custom_payload (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), post_body, "application/atom+xml", (gulong) 0);
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (post_body);
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	return self;
-#line 3511 "PicasaPublishing.c"
-}
-
-
-PublishingPicasaAlbumCreationTransaction* publishing_picasa_album_creation_transaction_new (PublishingRESTSupportGoogleSession* session, PublishingPicasaPublishingParameters* parameters) {
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	return publishing_picasa_album_creation_transaction_construct (PUBLISHING_PICASA_TYPE_ALBUM_CREATION_TRANSACTION, session, parameters);
-#line 3518 "PicasaPublishing.c"
-}
-
-
-static void publishing_picasa_album_creation_transaction_class_init (PublishingPicasaAlbumCreationTransactionClass * klass) {
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_picasa_album_creation_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 3525 "PicasaPublishing.c"
-}
-
-
-static void publishing_picasa_album_creation_transaction_instance_init (PublishingPicasaAlbumCreationTransaction * self) {
-}
-
-
-GType publishing_picasa_album_creation_transaction_get_type (void) {
-	static volatile gsize publishing_picasa_album_creation_transaction_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_picasa_album_creation_transaction_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (PublishingPicasaAlbumCreationTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_picasa_album_creation_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPicasaAlbumCreationTransaction), 0, (GInstanceInitFunc) publishing_picasa_album_creation_transaction_instance_init, NULL };
-		GType publishing_picasa_album_creation_transaction_type_id;
-		publishing_picasa_album_creation_transaction_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_AUTHENTICATED_TRANSACTION, "PublishingPicasaAlbumCreationTransaction", &g_define_type_info, 0);
-		g_once_init_leave (&publishing_picasa_album_creation_transaction_type_id__volatile, publishing_picasa_album_creation_transaction_type_id);
-	}
-	return publishing_picasa_album_creation_transaction_type_id__volatile;
-}
-
-
 static gpointer _publishing_rest_support_session_ref0 (gpointer self) {
-#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self ? publishing_rest_support_session_ref (self) : NULL;
-#line 3548 "PicasaPublishing.c"
+#line 2903 "PicasaPublishing.c"
 }
 
 
 static gpointer _publishing_picasa_publishing_parameters_ref0 (gpointer self) {
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self ? publishing_picasa_publishing_parameters_ref (self) : NULL;
-#line 3555 "PicasaPublishing.c"
+#line 2910 "PicasaPublishing.c"
 }
 
 
@@ -3597,88 +2940,157 @@ PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_construc
 	PublishingPicasaPublishingParameters* _tmp9_ = NULL;
 	SpitPublishingPublishable* _tmp10_ = NULL;
 	SpitPublishingPublishable* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
-	SpitPublishingPublishable* _tmp13_ = NULL;
-	SpitPublishingPublisherMediaType _tmp14_ = 0;
-	gchar* _tmp15_ = NULL;
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	SpitPublishingPublishable* _tmp12_ = NULL;
+	SpitPublishingPublisherMediaType _tmp13_ = 0;
+	GError * _inner_error_ = NULL;
+#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (parameters), NULL);
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = session;
-#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = parameters;
-#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = publishing_picasa_publishing_parameters_get_target_album_feed_url (_tmp1_);
-#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp3_ = _tmp2_;
-#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = (PublishingPicasaUploadTransaction*) publishing_rest_support_google_publisher_authenticated_transaction_construct (object_type, _tmp0_, _tmp3_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (_tmp3_);
-#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4_ = session;
-#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp5_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_vala_assert (_tmp5_, "session.is_authenticated()");
-#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp6_ = session;
-#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp7_ = _publishing_rest_support_session_ref0 (_tmp6_);
-#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->session = _tmp7_;
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp8_ = parameters;
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp9_ = _publishing_picasa_publishing_parameters_ref0 (_tmp8_);
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_picasa_publishing_parameters_unref0 (self->priv->parameters);
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->parameters = _tmp9_;
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp10_ = publishable;
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp11_ = _g_object_ref0 (_tmp10_);
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->publishable);
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->publishable = _tmp11_;
-#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp13_ = publishable;
-#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp14_ = spit_publishing_publishable_get_media_type (_tmp13_);
-#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (_tmp14_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp12_ = "video/mpeg";
-#line 3633 "PicasaPublishing.c"
+#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp12_ = publishable;
+#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp13_ = spit_publishing_publishable_get_media_type (_tmp12_);
+#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	if (_tmp13_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+#line 2985 "PicasaPublishing.c"
+		{
+			GFileInfo* info = NULL;
+			SpitPublishingPublishable* _tmp14_ = NULL;
+			GFile* _tmp15_ = NULL;
+			GFile* _tmp16_ = NULL;
+			GFileInfo* _tmp17_ = NULL;
+			GFileInfo* _tmp18_ = NULL;
+			GFileInfo* _tmp19_ = NULL;
+			const gchar* _tmp20_ = NULL;
+			gchar* _tmp21_ = NULL;
+#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_tmp14_ = self->priv->publishable;
+#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_tmp15_ = spit_publishing_publishable_get_serialized_file (_tmp14_);
+#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_tmp16_ = _tmp15_;
+#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_tmp17_ = g_file_query_info (_tmp16_, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_);
+#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_tmp18_ = _tmp17_;
+#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_g_object_unref0 (_tmp16_);
+#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			info = _tmp18_;
+#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 3012 "PicasaPublishing.c"
+				goto __catch10_g_error;
+			}
+#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_tmp19_ = info;
+#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_tmp20_ = g_file_info_get_content_type (_tmp19_);
+#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_tmp21_ = g_content_type_get_mime_type (_tmp20_);
+#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_g_free0 (self->priv->mime_type);
+#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			self->priv->mime_type = _tmp21_;
+#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_g_object_unref0 (info);
+#line 3027 "PicasaPublishing.c"
+		}
+		goto __finally10;
+		__catch10_g_error:
+		{
+			GError* err = NULL;
+			gchar* _tmp22_ = NULL;
+#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			err = _inner_error_;
+#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_inner_error_ = NULL;
+#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_tmp22_ = g_strdup ("video/mpeg");
+#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_g_free0 (self->priv->mime_type);
+#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			self->priv->mime_type = _tmp22_;
+#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_g_error_free0 (err);
+#line 3046 "PicasaPublishing.c"
+		}
+		__finally10:
+#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.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 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			g_clear_error (&_inner_error_);
+#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			return NULL;
+#line 3057 "PicasaPublishing.c"
+		}
 	} else {
-#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp12_ = "image/jpeg";
-#line 3637 "PicasaPublishing.c"
+		gchar* _tmp23_ = NULL;
+#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp23_ = g_strdup ("image/jpeg");
+#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_g_free0 (self->priv->mime_type);
+#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		self->priv->mime_type = _tmp23_;
+#line 3067 "PicasaPublishing.c"
 	}
-#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp15_ = g_strdup (_tmp12_);
-#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (self->priv->mime_type);
-#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->mime_type = _tmp15_;
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 3647 "PicasaPublishing.c"
+#line 3071 "PicasaPublishing.c"
 }
 
 
 PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_new (PublishingRESTSupportGoogleSession* session, PublishingPicasaPublishingParameters* parameters, SpitPublishingPublishable* publishable) {
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return publishing_picasa_upload_transaction_construct (PUBLISHING_PICASA_TYPE_UPLOAD_TRANSACTION, session, parameters, publishable);
-#line 3654 "PicasaPublishing.c"
+#line 3078 "PicasaPublishing.c"
 }
 
 
@@ -3701,7 +3113,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 3677 "PicasaPublishing.c"
+#line 3101 "PicasaPublishing.c"
 		glong _tmp4_ = 0L;
 #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
@@ -3709,7 +3121,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 3685 "PicasaPublishing.c"
+#line 3109 "PicasaPublishing.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
@@ -3721,7 +3133,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 3697 "PicasaPublishing.c"
+#line 3121 "PicasaPublishing.c"
 	}
 }
 
@@ -3745,21 +3157,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 3721 "PicasaPublishing.c"
+#line 3145 "PicasaPublishing.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 3727 "PicasaPublishing.c"
+#line 3151 "PicasaPublishing.c"
 	} else {
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 3731 "PicasaPublishing.c"
+#line 3155 "PicasaPublishing.c"
 	}
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 3735 "PicasaPublishing.c"
+#line 3159 "PicasaPublishing.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
@@ -3771,7 +3183,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 3747 "PicasaPublishing.c"
+#line 3171 "PicasaPublishing.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
@@ -3781,13 +3193,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 3757 "PicasaPublishing.c"
+#line 3181 "PicasaPublishing.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 3763 "PicasaPublishing.c"
+#line 3187 "PicasaPublishing.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
@@ -3801,7 +3213,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 3777 "PicasaPublishing.c"
+#line 3201 "PicasaPublishing.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
@@ -3811,13 +3223,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 3787 "PicasaPublishing.c"
+#line 3211 "PicasaPublishing.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 3793 "PicasaPublishing.c"
+#line 3217 "PicasaPublishing.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
 #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -3826,7 +3238,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 3802 "PicasaPublishing.c"
+#line 3226 "PicasaPublishing.c"
 	}
 #line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
@@ -3846,7 +3258,7 @@ 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 3822 "PicasaPublishing.c"
+#line 3246 "PicasaPublishing.c"
 }
 
 
@@ -3863,7 +3275,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 3839 "PicasaPublishing.c"
+#line 3263 "PicasaPublishing.c"
 	}
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = str_array;
@@ -3873,7 +3285,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 3849 "PicasaPublishing.c"
+#line 3273 "PicasaPublishing.c"
 	} else {
 		gchar** _tmp4_ = NULL;
 		gint _tmp4__length1 = 0;
@@ -3883,13 +3295,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 3859 "PicasaPublishing.c"
+#line 3283 "PicasaPublishing.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 3865 "PicasaPublishing.c"
+#line 3289 "PicasaPublishing.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
 		gchar** _tmp6_ = NULL;
@@ -3900,7 +3312,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 3876 "PicasaPublishing.c"
+#line 3300 "PicasaPublishing.c"
 			gchar** _tmp7_ = NULL;
 			gint _tmp7__length1 = 0;
 			const gchar* _tmp8_ = NULL;
@@ -3912,19 +3324,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 3888 "PicasaPublishing.c"
+#line 3312 "PicasaPublishing.c"
 		} else {
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp5_ = FALSE;
-#line 3892 "PicasaPublishing.c"
+#line 3316 "PicasaPublishing.c"
 		}
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = _tmp5_;
-#line 3896 "PicasaPublishing.c"
+#line 3320 "PicasaPublishing.c"
 	}
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
-#line 3900 "PicasaPublishing.c"
+#line 3324 "PicasaPublishing.c"
 		gint i = 0;
 		gsize len = 0UL;
 		gint _tmp31_ = 0;
@@ -3947,7 +3359,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 3923 "PicasaPublishing.c"
+#line 3347 "PicasaPublishing.c"
 		{
 			gboolean _tmp9_ = FALSE;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -3956,7 +3368,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 3932 "PicasaPublishing.c"
+#line 3356 "PicasaPublishing.c"
 				gboolean _tmp11_ = FALSE;
 				gboolean _tmp12_ = FALSE;
 				gchar** _tmp13_ = NULL;
@@ -3969,13 +3381,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 3945 "PicasaPublishing.c"
+#line 3369 "PicasaPublishing.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 3951 "PicasaPublishing.c"
+#line 3375 "PicasaPublishing.c"
 				}
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp9_ = FALSE;
@@ -3985,7 +3397,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 3961 "PicasaPublishing.c"
+#line 3385 "PicasaPublishing.c"
 					gint _tmp14_ = 0;
 					gchar** _tmp15_ = NULL;
 					gint _tmp15__length1 = 0;
@@ -3997,17 +3409,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 3973 "PicasaPublishing.c"
+#line 3397 "PicasaPublishing.c"
 				} else {
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp12_ = FALSE;
-#line 3977 "PicasaPublishing.c"
+#line 3401 "PicasaPublishing.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 3983 "PicasaPublishing.c"
+#line 3407 "PicasaPublishing.c"
 				} else {
 					gboolean _tmp16_ = FALSE;
 					gchar** _tmp17_ = NULL;
@@ -4018,7 +3430,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 3994 "PicasaPublishing.c"
+#line 3418 "PicasaPublishing.c"
 						gchar** _tmp18_ = NULL;
 						gint _tmp18__length1 = 0;
 						gint _tmp19_ = 0;
@@ -4033,21 +3445,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 4009 "PicasaPublishing.c"
+#line 3433 "PicasaPublishing.c"
 					} else {
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp16_ = FALSE;
-#line 4013 "PicasaPublishing.c"
+#line 3437 "PicasaPublishing.c"
 					}
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp11_ = _tmp16_;
-#line 4017 "PicasaPublishing.c"
+#line 3441 "PicasaPublishing.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 4023 "PicasaPublishing.c"
+#line 3447 "PicasaPublishing.c"
 				}
 #line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp22_ = str_array;
@@ -4059,7 +3471,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 4035 "PicasaPublishing.c"
+#line 3459 "PicasaPublishing.c"
 					gchar** _tmp25_ = NULL;
 					gint _tmp25__length1 = 0;
 					gint _tmp26_ = 0;
@@ -4080,24 +3492,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 4056 "PicasaPublishing.c"
+#line 3480 "PicasaPublishing.c"
 				} else {
 #line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp21_ = 0;
-#line 4060 "PicasaPublishing.c"
+#line 3484 "PicasaPublishing.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 4066 "PicasaPublishing.c"
+#line 3490 "PicasaPublishing.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 4073 "PicasaPublishing.c"
+#line 3497 "PicasaPublishing.c"
 			gchar* _tmp32_ = NULL;
 #line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp32_ = g_strdup ("");
@@ -4105,7 +3517,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 4081 "PicasaPublishing.c"
+#line 3505 "PicasaPublishing.c"
 		}
 #line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp33_ = i;
@@ -4143,7 +3555,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 4119 "PicasaPublishing.c"
+#line 3543 "PicasaPublishing.c"
 		{
 			gboolean _tmp46_ = FALSE;
 #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -4152,7 +3564,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 4128 "PicasaPublishing.c"
+#line 3552 "PicasaPublishing.c"
 				gint _tmp48_ = 0;
 				gchar** _tmp49_ = NULL;
 				gint _tmp49__length1 = 0;
@@ -4168,13 +3580,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 4144 "PicasaPublishing.c"
+#line 3568 "PicasaPublishing.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 4150 "PicasaPublishing.c"
+#line 3574 "PicasaPublishing.c"
 				}
 #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp46_ = FALSE;
@@ -4188,7 +3600,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 4164 "PicasaPublishing.c"
+#line 3588 "PicasaPublishing.c"
 				}
 #line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp50_ = ptr;
@@ -4208,7 +3620,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 4184 "PicasaPublishing.c"
+#line 3608 "PicasaPublishing.c"
 					gchar** _tmp57_ = NULL;
 					gint _tmp57__length1 = 0;
 					gint _tmp58_ = 0;
@@ -4223,11 +3635,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 4199 "PicasaPublishing.c"
+#line 3623 "PicasaPublishing.c"
 				} else {
 #line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp53_ = "";
-#line 4203 "PicasaPublishing.c"
+#line 3627 "PicasaPublishing.c"
 				}
 #line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp60_ = ptr;
@@ -4235,7 +3647,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 4211 "PicasaPublishing.c"
+#line 3635 "PicasaPublishing.c"
 			}
 		}
 #line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -4246,7 +3658,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 4222 "PicasaPublishing.c"
+#line 3646 "PicasaPublishing.c"
 	} else {
 		gchar* _tmp63_ = NULL;
 #line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -4255,7 +3667,7 @@ 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 4231 "PicasaPublishing.c"
+#line 3655 "PicasaPublishing.c"
 	}
 }
 
@@ -4300,27 +3712,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 4276 "PicasaPublishing.c"
+#line 3700 "PicasaPublishing.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 4282 "PicasaPublishing.c"
+#line 3706 "PicasaPublishing.c"
 }
 
 
 static void _vala_SoupBuffer_free (SoupBuffer* self) {
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_boxed_free (soup_buffer_get_type (), self);
-#line 4289 "PicasaPublishing.c"
+#line 3713 "PicasaPublishing.c"
 }
 
 
 static void _vala_SoupMultipart_free (SoupMultipart* self) {
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_boxed_free (soup_multipart_get_type (), self);
-#line 4296 "PicasaPublishing.c"
+#line 3720 "PicasaPublishing.c"
 }
 
 
@@ -4393,94 +3805,94 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 	gchar* _tmp109_ = NULL;
 	gchar* _tmp110_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_UPLOAD_TRANSACTION, PublishingPicasaUploadTransaction);
-#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = soup_multipart_new ("multipart/related");
-#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	message_parts = _tmp0_;
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = g_strdup ("");
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	summary = _tmp1_;
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = self->priv->publishable;
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp3_ = spit_publishing_publishable_get_publishing_name (_tmp2_);
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4_ = _tmp3_;
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp5_ = g_strcmp0 (_tmp4_, "") != 0;
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (_tmp4_);
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (_tmp5_) {
-#line 4391 "PicasaPublishing.c"
+#line 3815 "PicasaPublishing.c"
 		SpitPublishingPublishable* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
 		gchar* _tmp11_ = NULL;
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp6_ = self->priv->publishable;
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp7_ = spit_publishing_publishable_get_publishing_name (_tmp6_);
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp8_ = _tmp7_;
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp9_ = publishing_rest_support_decimal_entity_encode (_tmp8_);
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp10_ = _tmp9_;
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp11_ = g_strdup_printf ("<atom:summary>%s</atom:summary>", _tmp10_);
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_free0 (summary);
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		summary = _tmp11_;
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_free0 (_tmp10_);
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_free0 (_tmp8_);
-#line 4418 "PicasaPublishing.c"
+#line 3842 "PicasaPublishing.c"
 	}
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp12_ = self->priv->publishable;
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp14_ = spit_publishing_publishable_get_publishing_keywords (_tmp12_, &_tmp13_);
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	keywords = _tmp14_;
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	keywords_length1 = _tmp13_;
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_keywords_size_ = keywords_length1;
-#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp15_ = g_strdup ("");
-#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	keywords_string = _tmp15_;
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp16_ = keywords;
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp16__length1 = keywords_length1;
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (_tmp16__length1 > 0) {
-#line 4440 "PicasaPublishing.c"
+#line 3864 "PicasaPublishing.c"
 		const gchar* _tmp47_ = NULL;
 		gchar* _tmp48_ = NULL;
 		const gchar* _tmp49_ = NULL;
 		gchar* _tmp50_ = NULL;
 		{
 			gint i = 0;
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			i = 0;
-#line 4449 "PicasaPublishing.c"
+#line 3873 "PicasaPublishing.c"
 			{
 				gboolean _tmp17_ = FALSE;
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp17_ = TRUE;
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				while (TRUE) {
-#line 4456 "PicasaPublishing.c"
+#line 3880 "PicasaPublishing.c"
 					gint _tmp19_ = 0;
 					gchar** _tmp20_ = NULL;
 					gint _tmp20__length1 = 0;
@@ -4495,43 +3907,43 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 					const gchar* _tmp37_ = NULL;
 					gint _tmp38_ = 0;
 					gint _tmp39_ = 0;
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					if (!_tmp17_) {
-#line 4473 "PicasaPublishing.c"
+#line 3897 "PicasaPublishing.c"
 						gint _tmp18_ = 0;
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp18_ = i;
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						i = _tmp18_ + 1;
-#line 4479 "PicasaPublishing.c"
+#line 3903 "PicasaPublishing.c"
 					}
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp17_ = FALSE;
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp19_ = i;
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp20_ = keywords;
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp20__length1 = keywords_length1;
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					if (!(_tmp19_ < _tmp20__length1)) {
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						break;
-#line 4493 "PicasaPublishing.c"
+#line 3917 "PicasaPublishing.c"
 					}
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp21_ = keywords;
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp21__length1 = keywords_length1;
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp22_ = i;
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp23_ = _tmp21_[_tmp22_];
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp24_ = g_str_has_prefix (_tmp23_, "/");
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					if (_tmp24_) {
-#line 4507 "PicasaPublishing.c"
+#line 3931 "PicasaPublishing.c"
 						gchar** _tmp25_ = NULL;
 						gint _tmp25__length1 = 0;
 						gint _tmp26_ = 0;
@@ -4540,31 +3952,31 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 						gchar* _tmp29_ = NULL;
 						gchar** _tmp30_ = NULL;
 						gchar** _tmp31_ = NULL;
-#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp25_ = keywords;
-#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp25__length1 = keywords_length1;
-#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp26_ = i;
-#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp27_ = _tmp25_[_tmp26_];
-#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp28_ = string_substring (_tmp27_, (glong) 1, (glong) -1);
-#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp29_ = _tmp28_;
-#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp31_ = _tmp30_ = g_strsplit (_tmp29_, "/", 0);
-#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						tmp = (_vala_array_free (tmp, tmp_length1, (GDestroyNotify) g_free), NULL);
-#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						tmp = _tmp31_;
-#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						tmp_length1 = _vala_array_length (_tmp30_);
-#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp_size_ = tmp_length1;
-#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_g_free0 (_tmp29_);
-#line 4540 "PicasaPublishing.c"
+#line 3964 "PicasaPublishing.c"
 					} else {
 						gchar** _tmp32_ = NULL;
 						gint _tmp32__length1 = 0;
@@ -4572,143 +3984,143 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 						const gchar* _tmp34_ = NULL;
 						gchar** _tmp35_ = NULL;
 						gchar** _tmp36_ = NULL;
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp32_ = keywords;
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp32__length1 = keywords_length1;
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp33_ = i;
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp34_ = _tmp32_[_tmp33_];
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp36_ = _tmp35_ = g_strsplit (_tmp34_, "/", 0);
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						tmp = (_vala_array_free (tmp, tmp_length1, (GDestroyNotify) g_free), NULL);
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						tmp = _tmp36_;
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						tmp_length1 = _vala_array_length (_tmp35_);
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp_size_ = tmp_length1;
-#line 4566 "PicasaPublishing.c"
+#line 3990 "PicasaPublishing.c"
 					}
-#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp37_ = keywords_string;
-#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp38_ = strlen (_tmp37_);
-#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp39_ = _tmp38_;
-#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					if (_tmp39_ > 0) {
-#line 4576 "PicasaPublishing.c"
+#line 4000 "PicasaPublishing.c"
 						const gchar* _tmp40_ = NULL;
 						gchar** _tmp41_ = NULL;
 						gint _tmp41__length1 = 0;
 						gchar* _tmp42_ = NULL;
 						gchar* _tmp43_ = NULL;
 						gchar* _tmp44_ = NULL;
-#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp40_ = keywords_string;
-#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp41_ = tmp;
-#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp41__length1 = tmp_length1;
-#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp42_ = _vala_g_strjoinv (", ", _tmp41_, _tmp41__length1);
-#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp43_ = _tmp42_;
-#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp44_ = g_strjoin (", ", _tmp40_, _tmp43_, NULL);
-#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_g_free0 (keywords_string);
-#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						keywords_string = _tmp44_;
-#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_g_free0 (_tmp43_);
-#line 4601 "PicasaPublishing.c"
+#line 4025 "PicasaPublishing.c"
 					} else {
 						gchar** _tmp45_ = NULL;
 						gint _tmp45__length1 = 0;
 						gchar* _tmp46_ = NULL;
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp45_ = tmp;
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp45__length1 = tmp_length1;
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp46_ = _vala_g_strjoinv (", ", _tmp45_, _tmp45__length1);
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_g_free0 (keywords_string);
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						keywords_string = _tmp46_;
-#line 4616 "PicasaPublishing.c"
+#line 4040 "PicasaPublishing.c"
 					}
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					tmp = (_vala_array_free (tmp, tmp_length1, (GDestroyNotify) g_free), NULL);
-#line 4620 "PicasaPublishing.c"
+#line 4044 "PicasaPublishing.c"
 				}
 			}
 		}
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp47_ = keywords_string;
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp48_ = publishing_rest_support_decimal_entity_encode (_tmp47_);
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_free0 (keywords_string);
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		keywords_string = _tmp48_;
-#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp49_ = keywords_string;
-#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp50_ = g_strdup_printf ("<mrss:group><mrss:keywords>%s</mrss:keywords></mrss:group>", _tmp49_);
-#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_free0 (keywords_string);
-#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		keywords_string = _tmp50_;
-#line 4640 "PicasaPublishing.c"
+#line 4064 "PicasaPublishing.c"
 	}
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp51_ = self->priv->publishable;
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp52_ = spit_publishing_publishable_get_param_string (_tmp51_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp53_ = _tmp52_;
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp54_ = publishing_rest_support_decimal_entity_encode (_tmp53_);
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp55_ = _tmp54_;
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp56_ = summary;
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp57_ = keywords_string;
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp58_ = g_strdup_printf (PUBLISHING_PICASA_UPLOAD_TRANSACTION_METADATA_TEMPLATE, _tmp55_, _tmp56_, _tmp57_);
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp59_ = _tmp58_;
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (_tmp55_);
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (_tmp53_);
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	metadata = _tmp59_;
-#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp60_ = metadata;
-#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp61_ = string_get_data (_tmp60_, &_tmp61__length1);
-#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp62_ = _tmp61_;
-#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp62__length1 = _tmp61__length1;
-#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp63_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp62_, _tmp62__length1);
-#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	metadata_buffer = _tmp63_;
-#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp64_ = message_parts;
-#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp65_ = metadata_buffer;
-#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	soup_multipart_append_form_file (_tmp64_, "", "", "application/atom+xml", _tmp65_);
-#line 4684 "PicasaPublishing.c"
+#line 4108 "PicasaPublishing.c"
 	{
 		GMappedFile* _tmp66_ = NULL;
 		SpitPublishingPublishable* _tmp67_ = NULL;
@@ -4719,67 +4131,67 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 		GMappedFile* _tmp72_ = NULL;
 		GMappedFile* _tmp73_ = NULL;
 		GMappedFile* _tmp74_ = NULL;
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp67_ = self->priv->publishable;
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp68_ = spit_publishing_publishable_get_serialized_file (_tmp67_);
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp69_ = _tmp68_;
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp70_ = g_file_get_path (_tmp69_);
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp71_ = _tmp70_;
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp72_ = g_mapped_file_new (_tmp71_, FALSE, &_inner_error_);
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp73_ = _tmp72_;
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_free0 (_tmp71_);
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_object_unref0 (_tmp69_);
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp66_ = _tmp73_;
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			if (_inner_error_->domain == G_FILE_ERROR) {
-#line 4719 "PicasaPublishing.c"
-				goto __catch14_g_file_error;
+#line 4143 "PicasaPublishing.c"
+				goto __catch11_g_file_error;
 			}
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			__vala_SoupBuffer_free0 (metadata_buffer);
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_free0 (metadata);
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_free0 (keywords_string);
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_free0 (summary);
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			__vala_SoupMultipart_free0 (message_parts);
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.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 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return;
-#line 4740 "PicasaPublishing.c"
+#line 4164 "PicasaPublishing.c"
 		}
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp74_ = _tmp66_;
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp66_ = NULL;
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_mapped_file_unref0 (self->priv->mapped_file);
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		self->priv->mapped_file = _tmp74_;
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_mapped_file_unref0 (_tmp66_);
-#line 4752 "PicasaPublishing.c"
+#line 4176 "PicasaPublishing.c"
 	}
-	goto __finally14;
-	__catch14_g_file_error:
+	goto __finally11;
+	__catch11_g_file_error:
 	{
 		GError* e = NULL;
 		gchar* msg = NULL;
@@ -4795,283 +4207,283 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 		const gchar* _tmp84_ = NULL;
 		const gchar* _tmp85_ = NULL;
 		GError* _tmp86_ = NULL;
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		e = _inner_error_;
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_inner_error_ = NULL;
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp75_ = self->priv->publishable;
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp76_ = spit_publishing_publishable_get_serialized_file (_tmp75_);
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp77_ = _tmp76_;
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp78_ = g_file_get_path (_tmp77_);
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp79_ = _tmp78_;
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp80_ = e;
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp81_ = _tmp80_->message;
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp82_ = g_strdup_printf ("Picasa: couldn't read data from %s: %s", _tmp79_, _tmp81_);
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp83_ = _tmp82_;
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_free0 (_tmp79_);
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_object_unref0 (_tmp77_);
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		msg = _tmp83_;
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp84_ = msg;
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		g_warning ("PicasaPublishing.vala:574: %s", _tmp84_);
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		g_warning ("PicasaPublishing.vala:477: %s", _tmp84_);
+#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp85_ = msg;
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp86_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp85_);
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_inner_error_ = _tmp86_;
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_free0 (msg);
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_error_free0 (e);
-#line 4813 "PicasaPublishing.c"
-		goto __finally14;
+#line 4237 "PicasaPublishing.c"
+		goto __finally11;
 	}
-	__finally14:
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	__finally11:
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			g_propagate_error (error, _inner_error_);
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			__vala_SoupBuffer_free0 (metadata_buffer);
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_free0 (metadata);
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_free0 (keywords_string);
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_free0 (summary);
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			__vala_SoupMultipart_free0 (message_parts);
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return;
-#line 4837 "PicasaPublishing.c"
+#line 4261 "PicasaPublishing.c"
 		} else {
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			__vala_SoupBuffer_free0 (metadata_buffer);
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_free0 (metadata);
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_free0 (keywords_string);
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_free0 (summary);
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			__vala_SoupMultipart_free0 (message_parts);
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.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 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return;
-#line 4857 "PicasaPublishing.c"
+#line 4281 "PicasaPublishing.c"
 		}
 	}
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp87_ = self->priv->mapped_file;
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp88_ = g_mapped_file_get_contents (_tmp87_);
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	photo_data = (guint8*) _tmp88_;
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	photo_data_length1 = -1;
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_photo_data_size_ = photo_data_length1;
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp89_ = self->priv->mapped_file;
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp90_ = g_mapped_file_get_length (_tmp89_);
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	photo_data_length1 = (gint) _tmp90_;
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp91_ = photo_data_length1;
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp92_ = soup_buffer_new (SOUP_MEMORY_TEMPORARY, photo_data, photo_data_length1);
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	bindable_data = _tmp92_;
-#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp93_ = message_parts;
-#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp94_ = self->priv->publishable;
-#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp95_ = spit_publishing_publishable_get_serialized_file (_tmp94_);
-#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp96_ = _tmp95_;
-#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp97_ = g_file_get_path (_tmp96_);
-#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp98_ = _tmp97_;
-#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp99_ = self->priv->mime_type;
-#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	soup_multipart_append_form_file (_tmp93_, "", _tmp98_, _tmp99_, bindable_data);
-#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (_tmp98_);
-#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (_tmp96_);
-#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp100_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp101_ = _tmp100_;
-#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp102_ = message_parts;
-#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp103_ = soup_form_request_new_from_multipart (_tmp101_, _tmp102_);
-#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp104_ = _tmp103_;
-#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (_tmp101_);
-#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	outbound_message = _tmp104_;
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp105_ = outbound_message->request_headers;
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp106_ = self->priv->session;
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp107_ = publishing_rest_support_google_session_get_access_token (_tmp106_);
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp108_ = _tmp107_;
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp109_ = g_strconcat ("Bearer ", _tmp108_, NULL);
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp110_ = _tmp109_;
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	soup_message_headers_append (_tmp105_, "Authorization", _tmp110_);
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (_tmp110_);
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (_tmp108_);
-#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), outbound_message);
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_rest_support_transaction_set_is_executed (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), TRUE);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_rest_support_transaction_send (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			g_propagate_error (error, _inner_error_);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_object_unref0 (outbound_message);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			__vala_SoupBuffer_free0 (bindable_data);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			__vala_SoupBuffer_free0 (metadata_buffer);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_free0 (metadata);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_free0 (keywords_string);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_free0 (summary);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			__vala_SoupMultipart_free0 (message_parts);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return;
-#line 4964 "PicasaPublishing.c"
+#line 4388 "PicasaPublishing.c"
 		} else {
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_object_unref0 (outbound_message);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			__vala_SoupBuffer_free0 (bindable_data);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			__vala_SoupBuffer_free0 (metadata_buffer);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_free0 (metadata);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_free0 (keywords_string);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_free0 (summary);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			__vala_SoupMultipart_free0 (message_parts);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.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 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return;
-#line 4988 "PicasaPublishing.c"
+#line 4412 "PicasaPublishing.c"
 		}
 	}
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (outbound_message);
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	__vala_SoupBuffer_free0 (bindable_data);
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	__vala_SoupBuffer_free0 (metadata_buffer);
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (metadata);
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (keywords_string);
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (summary);
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	__vala_SoupMultipart_free0 (message_parts);
-#line 5007 "PicasaPublishing.c"
+#line 4431 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_upload_transaction_class_init (PublishingPicasaUploadTransactionClass * klass) {
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_upload_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_picasa_upload_transaction_finalize;
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingPicasaUploadTransactionPrivate));
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_picasa_upload_transaction_real_execute;
-#line 5020 "PicasaPublishing.c"
+#line 4444 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_upload_transaction_instance_init (PublishingPicasaUploadTransaction * self) {
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv = PUBLISHING_PICASA_UPLOAD_TRANSACTION_GET_PRIVATE (self);
-#line 5027 "PicasaPublishing.c"
+#line 4451 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_upload_transaction_finalize (PublishingRESTSupportTransaction* obj) {
 	PublishingPicasaUploadTransaction * self;
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PICASA_TYPE_UPLOAD_TRANSACTION, PublishingPicasaUploadTransaction);
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_picasa_publishing_parameters_unref0 (self->priv->parameters);
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->priv->mime_type);
-#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->publishable);
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_mapped_file_unref0 (self->priv->mapped_file);
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_picasa_upload_transaction_parent_class)->finalize (obj);
-#line 5047 "PicasaPublishing.c"
+#line 4471 "PicasaPublishing.c"
 }
 
 
@@ -5088,48 +4500,27 @@ GType publishing_picasa_upload_transaction_get_type (void) {
 
 
 static gpointer _publishing_picasa_publishing_options_pane_size_description_ref0 (gpointer self) {
-#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self ? publishing_picasa_publishing_options_pane_size_description_ref (self) : NULL;
-#line 5066 "PicasaPublishing.c"
-}
-
-
-static void _publishing_picasa_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_picasa_publishing_options_pane_on_use_existing_radio_clicked ((PublishingPicasaPublishingOptionsPane*) self);
-#line 5073 "PicasaPublishing.c"
-}
-
-
-static void _publishing_picasa_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_picasa_publishing_options_pane_on_create_new_radio_clicked ((PublishingPicasaPublishingOptionsPane*) self);
-#line 5080 "PicasaPublishing.c"
-}
-
-
-static void _publishing_picasa_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_picasa_publishing_options_pane_on_new_album_entry_changed ((PublishingPicasaPublishingOptionsPane*) self);
-#line 5087 "PicasaPublishing.c"
+#line 4490 "PicasaPublishing.c"
 }
 
 
 static void _publishing_picasa_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_publishing_options_pane_on_logout_clicked ((PublishingPicasaPublishingOptionsPane*) self);
-#line 5094 "PicasaPublishing.c"
+#line 4497 "PicasaPublishing.c"
 }
 
 
 static void _publishing_picasa_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_publishing_options_pane_on_publish_clicked ((PublishingPicasaPublishingOptionsPane*) self);
-#line 5101 "PicasaPublishing.c"
+#line 4504 "PicasaPublishing.c"
 }
 
 
-PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane_construct (GType object_type, GtkBuilder* builder, PublishingPicasaPublishingParameters* parameters) {
+PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane_construct (GType object_type, GtkBuilder* builder, PublishingPicasaPublishingParameters* parameters, gboolean can_logout) {
 	PublishingPicasaPublishingOptionsPane * self = NULL;
 	gint _tmp0_ = 0;
 	PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp1_ = NULL;
@@ -5153,376 +4544,344 @@ PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane
 	GtkLabel* _tmp19_ = NULL;
 	GtkBuilder* _tmp20_ = NULL;
 	GObject* _tmp21_ = NULL;
-	GtkRadioButton* _tmp22_ = NULL;
+	GtkComboBoxText* _tmp22_ = NULL;
 	GtkBuilder* _tmp23_ = NULL;
 	GObject* _tmp24_ = NULL;
-	GtkComboBoxText* _tmp25_ = NULL;
+	GtkCheckButton* _tmp25_ = NULL;
 	GtkBuilder* _tmp26_ = NULL;
 	GObject* _tmp27_ = NULL;
-	GtkRadioButton* _tmp28_ = NULL;
+	GtkComboBoxText* _tmp28_ = NULL;
 	GtkBuilder* _tmp29_ = NULL;
 	GObject* _tmp30_ = NULL;
-	GtkEntry* _tmp31_ = NULL;
+	GtkCheckButton* _tmp31_ = NULL;
 	GtkBuilder* _tmp32_ = NULL;
 	GObject* _tmp33_ = NULL;
-	GtkCheckButton* _tmp34_ = NULL;
+	GtkButton* _tmp34_ = NULL;
 	GtkBuilder* _tmp35_ = NULL;
 	GObject* _tmp36_ = NULL;
-	GtkComboBoxText* _tmp37_ = NULL;
-	GtkBuilder* _tmp38_ = NULL;
-	GObject* _tmp39_ = NULL;
-	GtkCheckButton* _tmp40_ = NULL;
-	GtkBuilder* _tmp41_ = NULL;
-	GObject* _tmp42_ = NULL;
-	GtkButton* _tmp43_ = NULL;
-	GtkBuilder* _tmp44_ = NULL;
-	GObject* _tmp45_ = NULL;
-	GtkButton* _tmp46_ = NULL;
-	GtkLabel* _tmp47_ = NULL;
-	const gchar* _tmp48_ = NULL;
-	PublishingPicasaPublishingParameters* _tmp49_ = NULL;
-	gchar* _tmp50_ = NULL;
-	gchar* _tmp51_ = NULL;
-	gchar* _tmp52_ = NULL;
-	gchar* _tmp53_ = NULL;
-	GtkCheckButton* _tmp54_ = NULL;
-	PublishingPicasaPublishingParameters* _tmp55_ = NULL;
-	gboolean _tmp56_ = FALSE;
-	PublishingPicasaPublishingParameters* _tmp57_ = NULL;
-	SpitPublishingPublisherMediaType _tmp58_ = 0;
-	GtkRadioButton* _tmp75_ = NULL;
-	GtkRadioButton* _tmp76_ = NULL;
-	GtkEntry* _tmp77_ = NULL;
-	GtkButton* _tmp78_ = NULL;
-	GtkButton* _tmp79_ = NULL;
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	GtkButton* _tmp37_ = NULL;
+	gboolean _tmp38_ = FALSE;
+	GtkLabel* _tmp43_ = NULL;
+	const gchar* _tmp44_ = NULL;
+	PublishingPicasaPublishingParameters* _tmp45_ = NULL;
+	gchar* _tmp46_ = NULL;
+	gchar* _tmp47_ = NULL;
+	gchar* _tmp48_ = NULL;
+	gchar* _tmp49_ = NULL;
+	GtkCheckButton* _tmp50_ = NULL;
+	PublishingPicasaPublishingParameters* _tmp51_ = NULL;
+	gboolean _tmp52_ = FALSE;
+	PublishingPicasaPublishingParameters* _tmp53_ = NULL;
+	SpitPublishingPublisherMediaType _tmp54_ = 0;
+	GtkButton* _tmp71_ = NULL;
+	GtkButton* _tmp72_ = NULL;
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (GTK_IS_BUILDER (builder), NULL);
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (parameters), NULL);
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = (PublishingPicasaPublishingOptionsPane*) g_object_new (object_type, NULL);
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = publishing_picasa_publishing_options_pane_create_size_descriptions (self, &_tmp0_);
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->size_descriptions = (_vala_array_free (self->priv->size_descriptions, self->priv->size_descriptions_length1, (GDestroyNotify) publishing_picasa_publishing_options_pane_size_description_unref), NULL);
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->size_descriptions = _tmp1_;
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->size_descriptions_length1 = _tmp0_;
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->_size_descriptions_size_ = self->priv->size_descriptions_length1;
-#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = builder;
-#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->builder = _tmp3_;
-#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4_ = builder;
-#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_vala_assert (_tmp4_ != NULL, "builder != null");
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp5_ = builder;
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp6_ = gtk_builder_get_objects (_tmp5_);
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp7_ = _tmp6_;
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp8_ = g_slist_length (_tmp7_);
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_vala_assert (_tmp8_ > ((guint) 0), "builder.get_objects().length() > 0");
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_slist_free0 (_tmp7_);
-#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp9_ = parameters;
-#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp10_ = _publishing_picasa_publishing_parameters_ref0 (_tmp9_);
-#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_picasa_publishing_parameters_unref0 (self->priv->parameters);
-#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->parameters = _tmp10_;
-#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp11_ = builder;
-#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp12_ = gtk_builder_get_object (_tmp11_, "picasa_pane_widget");
-#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp13_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_box_get_type (), GtkBox));
-#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->pane_widget);
-#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->pane_widget = _tmp13_;
-#line 646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp14_ = builder;
-#line 646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp15_ = gtk_builder_get_object (_tmp14_, "login_identity_label");
-#line 646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp16_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_label_get_type (), GtkLabel));
-#line 646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->login_identity_label);
-#line 646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->login_identity_label = _tmp16_;
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp17_ = builder;
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp18_ = gtk_builder_get_object (_tmp17_, "publish_to_label");
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_label_get_type (), GtkLabel));
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->publish_to_label);
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->publish_to_label = _tmp19_;
-#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp20_ = builder;
-#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp21_ = gtk_builder_get_object (_tmp20_, "use_existing_radio");
-#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_radio_button_get_type (), GtkRadioButton));
-#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_object_unref0 (self->priv->use_existing_radio);
-#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->use_existing_radio = _tmp22_;
-#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp23_ = builder;
-#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp24_ = gtk_builder_get_object (_tmp23_, "existing_albums_combo");
-#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_combo_box_text_get_type (), GtkComboBoxText));
-#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp21_ = gtk_builder_get_object (_tmp20_, "existing_albums_combo");
+#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_combo_box_text_get_type (), GtkComboBoxText));
+#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->existing_albums_combo);
-#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->existing_albums_combo = _tmp25_;
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp26_ = builder;
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp27_ = gtk_builder_get_object (_tmp26_, "create_new_radio");
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_radio_button_get_type (), GtkRadioButton));
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_object_unref0 (self->priv->create_new_radio);
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->create_new_radio = _tmp28_;
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp29_ = builder;
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp30_ = gtk_builder_get_object (_tmp29_, "new_album_entry");
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp31_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_entry_get_type (), GtkEntry));
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_object_unref0 (self->priv->new_album_entry);
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->new_album_entry = _tmp31_;
-#line 652 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp32_ = builder;
-#line 652 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp33_ = gtk_builder_get_object (_tmp32_, "public_check");
-#line 652 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp34_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_check_button_get_type (), GtkCheckButton));
-#line 652 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	self->priv->existing_albums_combo = _tmp22_;
+#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp23_ = builder;
+#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp24_ = gtk_builder_get_object (_tmp23_, "public_check");
+#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_check_button_get_type (), GtkCheckButton));
+#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->public_check);
-#line 652 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->public_check = _tmp34_;
-#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp35_ = builder;
-#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp36_ = gtk_builder_get_object (_tmp35_, "size_combo");
-#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp37_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_combo_box_text_get_type (), GtkComboBoxText));
-#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	self->priv->public_check = _tmp25_;
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp26_ = builder;
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp27_ = gtk_builder_get_object (_tmp26_, "size_combo");
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_combo_box_text_get_type (), GtkComboBoxText));
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->size_combo);
-#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->size_combo = _tmp37_;
-#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp38_ = self->priv->builder;
-#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp39_ = gtk_builder_get_object (_tmp38_, "strip_metadata_check");
-#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp40_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_check_button_get_type (), GtkCheckButton));
-#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	self->priv->size_combo = _tmp28_;
+#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp29_ = self->priv->builder;
+#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp30_ = gtk_builder_get_object (_tmp29_, "strip_metadata_check");
+#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp31_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_check_button_get_type (), GtkCheckButton));
+#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->strip_metadata_check);
-#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->strip_metadata_check = _tmp40_;
-#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp41_ = builder;
-#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp42_ = gtk_builder_get_object (_tmp41_, "publish_button");
-#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp43_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_button_get_type (), GtkButton));
-#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	self->priv->strip_metadata_check = _tmp31_;
+#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp32_ = builder;
+#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp33_ = gtk_builder_get_object (_tmp32_, "publish_button");
+#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp34_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_button_get_type (), GtkButton));
+#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->publish_button);
-#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->publish_button = _tmp43_;
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp44_ = builder;
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp45_ = gtk_builder_get_object (_tmp44_, "logout_button");
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp46_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_button_get_type (), GtkButton));
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	self->priv->publish_button = _tmp34_;
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp35_ = builder;
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp36_ = gtk_builder_get_object (_tmp35_, "logout_button");
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp37_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_button_get_type (), GtkButton));
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->logout_button);
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->logout_button = _tmp46_;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp47_ = self->priv->login_identity_label;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp48_ = _ ("You are logged into Picasa Web Albums as %s.");
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp49_ = parameters;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp50_ = publishing_picasa_publishing_parameters_get_user_name (_tmp49_);
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp51_ = _tmp50_;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp52_ = g_strdup_printf (_tmp48_, _tmp51_);
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp53_ = _tmp52_;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	gtk_label_set_label (_tmp47_, _tmp53_);
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (_tmp53_);
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (_tmp51_);
-#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp54_ = self->priv->strip_metadata_check;
-#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp55_ = parameters;
-#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp56_ = publishing_picasa_publishing_parameters_get_strip_metadata (_tmp55_);
-#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp56_);
-#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp57_ = parameters;
-#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp58_ = publishing_picasa_publishing_parameters_get_media_type (_tmp57_);
-#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if ((_tmp58_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) == 0) {
-#line 5373 "PicasaPublishing.c"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	self->priv->logout_button = _tmp37_;
+#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp38_ = can_logout;
+#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	if (!_tmp38_) {
+#line 4705 "PicasaPublishing.c"
+		GtkButton* _tmp39_ = NULL;
+		GtkContainer* _tmp40_ = NULL;
+		GtkContainer* _tmp41_ = NULL;
+		GtkButton* _tmp42_ = NULL;
+#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp39_ = self->priv->logout_button;
+#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp40_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget));
+#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp41_ = _tmp40_;
+#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp42_ = self->priv->logout_button;
+#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		gtk_container_remove (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget));
+#line 4720 "PicasaPublishing.c"
+	}
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp43_ = self->priv->login_identity_label;
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp44_ = _ ("You are logged into Picasa Web Albums as %s.");
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp45_ = parameters;
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp46_ = publishing_picasa_publishing_parameters_get_user_name (_tmp45_);
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp47_ = _tmp46_;
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp48_ = g_strdup_printf (_tmp44_, _tmp47_);
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp49_ = _tmp48_;
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	gtk_label_set_label (_tmp43_, _tmp49_);
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_g_free0 (_tmp49_);
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_g_free0 (_tmp47_);
+#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp50_ = self->priv->strip_metadata_check;
+#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp51_ = parameters;
+#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp52_ = publishing_picasa_publishing_parameters_get_strip_metadata (_tmp51_);
+#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp52_);
+#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp53_ = parameters;
+#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp54_ = publishing_picasa_publishing_parameters_get_media_type (_tmp53_);
+#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	if ((_tmp54_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) == 0) {
+#line 4756 "PicasaPublishing.c"
+		GtkLabel* _tmp55_ = NULL;
+		const gchar* _tmp56_ = NULL;
+		GtkComboBoxText* _tmp57_ = NULL;
+		GtkComboBoxText* _tmp58_ = NULL;
+#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp55_ = self->priv->publish_to_label;
+#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp56_ = _ ("Videos will appear in:");
+#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		gtk_label_set_label (_tmp55_, _tmp56_);
+#line 567 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp57_ = self->priv->size_combo;
+#line 567 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp58_ = self->priv->size_combo;
+#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 4775 "PicasaPublishing.c"
+	} else {
 		GtkLabel* _tmp59_ = NULL;
 		const gchar* _tmp60_ = NULL;
-		GtkComboBoxText* _tmp61_ = NULL;
-		GtkComboBoxText* _tmp62_ = NULL;
-#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp61_ = NULL;
+		gint _tmp61__length1 = 0;
+		GtkComboBoxText* _tmp66_ = NULL;
+		GtkComboBoxText* _tmp67_ = NULL;
+		GtkComboBoxText* _tmp68_ = NULL;
+		PublishingPicasaPublishingParameters* _tmp69_ = NULL;
+		gint _tmp70_ = 0;
+#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp59_ = self->priv->publish_to_label;
-#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp60_ = _ ("Videos will appear in:");
-#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp60_ = _ ("Photos will appear in:");
+#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		gtk_label_set_label (_tmp59_, _tmp60_);
-#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp61_ = self->priv->size_combo;
-#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp62_ = self->priv->size_combo;
-#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 5392 "PicasaPublishing.c"
-	} else {
-		GtkLabel* _tmp63_ = NULL;
-		const gchar* _tmp64_ = NULL;
-		PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp65_ = NULL;
-		gint _tmp65__length1 = 0;
-		GtkComboBoxText* _tmp70_ = NULL;
-		GtkComboBoxText* _tmp71_ = NULL;
-		GtkComboBoxText* _tmp72_ = NULL;
-		PublishingPicasaPublishingParameters* _tmp73_ = NULL;
-		gint _tmp74_ = 0;
-#line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp63_ = self->priv->publish_to_label;
-#line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp64_ = _ ("Photos will appear in:");
-#line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		gtk_label_set_label (_tmp63_, _tmp64_);
-#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp65_ = self->priv->size_descriptions;
-#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp65__length1 = self->priv->size_descriptions_length1;
-#line 5413 "PicasaPublishing.c"
+#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp61_ = self->priv->size_descriptions;
+#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp61__length1 = self->priv->size_descriptions_length1;
+#line 4796 "PicasaPublishing.c"
 		{
 			PublishingPicasaPublishingOptionsPaneSizeDescription** desc_collection = NULL;
 			gint desc_collection_length1 = 0;
 			gint _desc_collection_size_ = 0;
 			gint desc_it = 0;
-#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			desc_collection = _tmp65_;
-#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			desc_collection_length1 = _tmp65__length1;
-#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			for (desc_it = 0; desc_it < _tmp65__length1; desc_it = desc_it + 1) {
-#line 5425 "PicasaPublishing.c"
-				PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp66_ = NULL;
+#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			desc_collection = _tmp61_;
+#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			desc_collection_length1 = _tmp61__length1;
+#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			for (desc_it = 0; desc_it < _tmp61__length1; desc_it = desc_it + 1) {
+#line 4808 "PicasaPublishing.c"
+				PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp62_ = NULL;
 				PublishingPicasaPublishingOptionsPaneSizeDescription* desc = NULL;
-#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-				_tmp66_ = _publishing_picasa_publishing_options_pane_size_description_ref0 (desc_collection[desc_it]);
-#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-				desc = _tmp66_;
-#line 5432 "PicasaPublishing.c"
+#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+				_tmp62_ = _publishing_picasa_publishing_options_pane_size_description_ref0 (desc_collection[desc_it]);
+#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+				desc = _tmp62_;
+#line 4815 "PicasaPublishing.c"
 				{
-					GtkComboBoxText* _tmp67_ = NULL;
-					PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp68_ = NULL;
-					const gchar* _tmp69_ = NULL;
-#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp67_ = self->priv->size_combo;
-#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp68_ = desc;
-#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp69_ = _tmp68_->name;
-#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					gtk_combo_box_text_append_text (_tmp67_, _tmp69_);
-#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+					GtkComboBoxText* _tmp63_ = NULL;
+					PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp64_ = NULL;
+					const gchar* _tmp65_ = NULL;
+#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+					_tmp63_ = self->priv->size_combo;
+#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+					_tmp64_ = desc;
+#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+					_tmp65_ = _tmp64_->name;
+#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+					gtk_combo_box_text_append_text (_tmp63_, _tmp65_);
+#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_publishing_picasa_publishing_options_pane_size_description_unref0 (desc);
-#line 5447 "PicasaPublishing.c"
+#line 4830 "PicasaPublishing.c"
 				}
 			}
 		}
-#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp70_ = self->priv->size_combo;
-#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp71_ = self->priv->size_combo;
-#line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp72_ = self->priv->size_combo;
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp73_ = parameters;
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp74_ = publishing_picasa_publishing_parameters_get_major_axis_size_selection_id (_tmp73_);
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_combo_box_get_type (), GtkComboBox), _tmp74_);
-#line 5467 "PicasaPublishing.c"
+#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp66_ = self->priv->size_combo;
+#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp67_ = self->priv->size_combo;
+#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp68_ = self->priv->size_combo;
+#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp69_ = parameters;
+#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp70_ = publishing_picasa_publishing_parameters_get_major_axis_size_selection_id (_tmp69_);
+#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_combo_box_get_type (), GtkComboBox), _tmp70_);
+#line 4850 "PicasaPublishing.c"
 	}
-#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp75_ = self->priv->use_existing_radio;
-#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_picasa_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked, self, 0);
-#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp76_ = self->priv->create_new_radio;
-#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_picasa_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked, self, 0);
-#line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp77_ = self->priv->new_album_entry;
-#line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_picasa_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed, self, 0);
-#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp78_ = self->priv->logout_button;
-#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_connect_object (_tmp78_, "clicked", (GCallback) _publishing_picasa_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
-#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp79_ = self->priv->publish_button;
-#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_connect_object (_tmp79_, "clicked", (GCallback) _publishing_picasa_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp71_ = self->priv->logout_button;
+#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_signal_connect_object (_tmp71_, "clicked", (GCallback) _publishing_picasa_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp72_ = self->priv->publish_button;
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_signal_connect_object (_tmp72_, "clicked", (GCallback) _publishing_picasa_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 5491 "PicasaPublishing.c"
+#line 4862 "PicasaPublishing.c"
 }
 
 
-PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane_new (GtkBuilder* builder, PublishingPicasaPublishingParameters* parameters) {
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	return publishing_picasa_publishing_options_pane_construct (PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, builder, parameters);
-#line 5498 "PicasaPublishing.c"
+PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane_new (GtkBuilder* builder, PublishingPicasaPublishingParameters* parameters, gboolean can_logout) {
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	return publishing_picasa_publishing_options_pane_construct (PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, builder, parameters, can_logout);
+#line 4869 "PicasaPublishing.c"
 }
 
 
@@ -5532,425 +4891,212 @@ static void publishing_picasa_publishing_options_pane_on_publish_clicked (Publis
 	gint _tmp2_ = 0;
 	gint size_combo_last_active = 0;
 	PublishingPicasaPublishingParameters* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
-	PublishingPicasaPublishingParameters* _tmp7_ = NULL;
-	PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
+	PublishingPicasaPublishingParameters* _tmp6_ = NULL;
+	PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp7_ = NULL;
+	gint _tmp7__length1 = 0;
+	PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp8_ = NULL;
 	gint _tmp9_ = 0;
-	PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	PublishingPicasaPublishingParameters* _tmp12_ = NULL;
-	GtkCheckButton* _tmp13_ = NULL;
-	gboolean _tmp14_ = FALSE;
+	PublishingPicasaPublishingParameters* _tmp10_ = NULL;
+	GtkCheckButton* _tmp11_ = NULL;
+	gboolean _tmp12_ = FALSE;
 	PublishingPicasaAlbum** albums = NULL;
-	PublishingPicasaPublishingParameters* _tmp15_ = NULL;
-	gint _tmp16_ = 0;
-	PublishingPicasaAlbum** _tmp17_ = NULL;
+	PublishingPicasaPublishingParameters* _tmp13_ = NULL;
+	gint _tmp14_ = 0;
+	PublishingPicasaAlbum** _tmp15_ = NULL;
 	gint albums_length1 = 0;
 	gint _albums_size_ = 0;
-	GtkRadioButton* _tmp18_ = NULL;
-	gboolean _tmp19_ = FALSE;
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	PublishingPicasaPublishingParameters* _tmp16_ = NULL;
+	GtkComboBoxText* _tmp17_ = NULL;
+	gint _tmp18_ = 0;
+	PublishingPicasaAlbum* _tmp19_ = NULL;
+	const gchar* _tmp20_ = NULL;
+	PublishingPicasaPublishingParameters* _tmp21_ = NULL;
+	GtkComboBoxText* _tmp22_ = NULL;
+	gint _tmp23_ = 0;
+	PublishingPicasaAlbum* _tmp24_ = NULL;
+	const gchar* _tmp25_ = NULL;
+#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = self->priv->size_combo;
-#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (_tmp2_ >= 0) {
-#line 5534 "PicasaPublishing.c"
+#line 4911 "PicasaPublishing.c"
 		GtkComboBoxText* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
-#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp3_ = self->priv->size_combo;
-#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp4_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox));
-#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp0_ = _tmp4_;
-#line 5543 "PicasaPublishing.c"
+#line 4920 "PicasaPublishing.c"
 	} else {
-#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp0_ = 0;
-#line 5547 "PicasaPublishing.c"
+#line 4924 "PicasaPublishing.c"
 	}
-#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	size_combo_last_active = _tmp0_;
-#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp5_ = self->priv->parameters;
-#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp6_ = size_combo_last_active;
-#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_picasa_publishing_parameters_set_major_axis_size_selection_id (_tmp5_, _tmp6_);
-#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp7_ = self->priv->parameters;
-#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp8_ = self->priv->size_descriptions;
-#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp8__length1 = self->priv->size_descriptions_length1;
-#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp9_ = size_combo_last_active;
-#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp10_ = _tmp8_[_tmp9_];
-#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp11_ = _tmp10_->major_axis_pixels;
-#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_picasa_publishing_parameters_set_major_axis_size_pixels (_tmp7_, _tmp11_);
-#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp12_ = self->priv->parameters;
-#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp13_ = self->priv->strip_metadata_check;
-#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp14_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_picasa_publishing_parameters_set_strip_metadata (_tmp12_, _tmp14_);
-#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp15_ = self->priv->parameters;
-#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp17_ = publishing_picasa_publishing_parameters_get_albums (_tmp15_, &_tmp16_);
-#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	albums = _tmp17_;
-#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	albums_length1 = _tmp16_;
-#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	publishing_picasa_publishing_parameters_set_major_axis_size_selection_id (_tmp5_, size_combo_last_active);
+#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp6_ = self->priv->parameters;
+#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp7_ = self->priv->size_descriptions;
+#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp7__length1 = self->priv->size_descriptions_length1;
+#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp8_ = _tmp7_[size_combo_last_active];
+#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp9_ = _tmp8_->major_axis_pixels;
+#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	publishing_picasa_publishing_parameters_set_major_axis_size_pixels (_tmp6_, _tmp9_);
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp10_ = self->priv->parameters;
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp11_ = self->priv->strip_metadata_check;
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp12_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	publishing_picasa_publishing_parameters_set_strip_metadata (_tmp10_, _tmp12_);
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp13_ = self->priv->parameters;
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp15_ = publishing_picasa_publishing_parameters_get_albums (_tmp13_, &_tmp14_);
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	albums = _tmp15_;
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	albums_length1 = _tmp14_;
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_albums_size_ = albums_length1;
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp18_ = self->priv->create_new_radio;
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp19_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (_tmp19_) {
-#line 5595 "PicasaPublishing.c"
-		PublishingPicasaPublishingParameters* _tmp20_ = NULL;
-		GtkEntry* _tmp21_ = NULL;
-		const gchar* _tmp22_ = NULL;
-		PublishingPicasaPublishingParameters* _tmp23_ = NULL;
-		PublishingPicasaPublishingParameters* _tmp24_ = NULL;
-		GtkCheckButton* _tmp25_ = NULL;
-		gboolean _tmp26_ = FALSE;
-#line 701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp20_ = self->priv->parameters;
-#line 701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp21_ = self->priv->new_album_entry;
-#line 701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp22_ = gtk_entry_get_text (_tmp21_);
-#line 701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		publishing_picasa_publishing_parameters_set_target_album_name (_tmp20_, _tmp22_);
-#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp23_ = self->priv->parameters;
-#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		publishing_picasa_publishing_parameters_set_is_to_new_album (_tmp23_, TRUE);
-#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp24_ = self->priv->parameters;
-#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp25_ = self->priv->public_check;
-#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp26_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		publishing_picasa_publishing_parameters_set_is_new_album_public (_tmp24_, _tmp26_);
-#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		g_signal_emit_by_name (self, "publish");
-#line 5625 "PicasaPublishing.c"
-	} else {
-		PublishingPicasaPublishingParameters* _tmp27_ = NULL;
-		PublishingPicasaAlbum** _tmp28_ = NULL;
-		gint _tmp28__length1 = 0;
-		GtkComboBoxText* _tmp29_ = NULL;
-		gint _tmp30_ = 0;
-		PublishingPicasaAlbum* _tmp31_ = NULL;
-		const gchar* _tmp32_ = NULL;
-		PublishingPicasaPublishingParameters* _tmp33_ = NULL;
-		PublishingPicasaPublishingParameters* _tmp34_ = NULL;
-		PublishingPicasaAlbum** _tmp35_ = NULL;
-		gint _tmp35__length1 = 0;
-		GtkComboBoxText* _tmp36_ = NULL;
-		gint _tmp37_ = 0;
-		PublishingPicasaAlbum* _tmp38_ = NULL;
-		const gchar* _tmp39_ = NULL;
-#line 706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp27_ = self->priv->parameters;
-#line 706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp28_ = albums;
-#line 706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp28__length1 = albums_length1;
-#line 706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp29_ = self->priv->existing_albums_combo;
-#line 706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp30_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_combo_box_get_type (), GtkComboBox));
-#line 706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp31_ = _tmp28_[_tmp30_];
-#line 706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp32_ = _tmp31_->name;
-#line 706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		publishing_picasa_publishing_parameters_set_target_album_name (_tmp27_, _tmp32_);
-#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp33_ = self->priv->parameters;
-#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		publishing_picasa_publishing_parameters_set_is_to_new_album (_tmp33_, FALSE);
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp34_ = self->priv->parameters;
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp35_ = albums;
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp35__length1 = albums_length1;
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp36_ = self->priv->existing_albums_combo;
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp37_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_combo_box_get_type (), GtkComboBox));
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp38_ = _tmp35_[_tmp37_];
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp39_ = _tmp38_->url;
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		publishing_picasa_publishing_parameters_set_target_album_entry_url (_tmp34_, _tmp39_);
-#line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		g_signal_emit_by_name (self, "publish");
-#line 5680 "PicasaPublishing.c"
-	}
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp16_ = self->priv->parameters;
+#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp17_ = self->priv->existing_albums_combo;
+#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp18_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_combo_box_get_type (), GtkComboBox));
+#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp19_ = albums[_tmp18_];
+#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp20_ = _tmp19_->name;
+#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	publishing_picasa_publishing_parameters_set_target_album_name (_tmp16_, _tmp20_);
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp21_ = self->priv->parameters;
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp22_ = self->priv->existing_albums_combo;
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp23_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_combo_box_get_type (), GtkComboBox));
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp24_ = albums[_tmp23_];
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp25_ = _tmp24_->url;
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	publishing_picasa_publishing_parameters_set_target_album_entry_url (_tmp21_, _tmp25_);
+#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_signal_emit_by_name (self, "publish");
+#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	albums = (_vala_array_free (albums, albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 5684 "PicasaPublishing.c"
-}
-
-
-static void publishing_picasa_publishing_options_pane_on_use_existing_radio_clicked (PublishingPicasaPublishingOptionsPane* self) {
-	GtkComboBoxText* _tmp0_ = NULL;
-	GtkEntry* _tmp1_ = NULL;
-	GtkComboBoxText* _tmp2_ = NULL;
-	GtkCheckButton* _tmp3_ = NULL;
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = self->priv->existing_albums_combo;
-#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp1_ = self->priv->new_album_entry;
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp2_ = self->priv->existing_albums_combo;
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_picasa_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp3_ = self->priv->public_check;
-#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 5713 "PicasaPublishing.c"
-}
-
-
-static void publishing_picasa_publishing_options_pane_on_create_new_radio_clicked (PublishingPicasaPublishingOptionsPane* self) {
-	GtkEntry* _tmp0_ = NULL;
-	GtkComboBoxText* _tmp1_ = NULL;
-	GtkEntry* _tmp2_ = NULL;
-	GtkCheckButton* _tmp3_ = NULL;
-#line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = self->priv->new_album_entry;
-#line 722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp1_ = self->priv->existing_albums_combo;
-#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp2_ = self->priv->new_album_entry;
-#line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_picasa_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp3_ = self->priv->public_check;
-#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 5742 "PicasaPublishing.c"
+#line 4990 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_publishing_options_pane_on_logout_clicked (PublishingPicasaPublishingOptionsPane* self) {
-#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_emit_by_name (self, "logout");
-#line 5751 "PicasaPublishing.c"
-}
-
-
-static gchar* string_strip (const gchar* self) {
-	gchar* result = NULL;
-	gchar* _result_ = NULL;
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	result = _result_;
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	return result;
-#line 5774 "PicasaPublishing.c"
+#line 4999 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_publishing_options_pane_update_publish_button_sensitivity (PublishingPicasaPublishingOptionsPane* self) {
-	gchar* album_name = NULL;
-	GtkEntry* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
-	GtkButton* _tmp10_ = NULL;
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = self->priv->new_album_entry;
-#line 734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp1_ = gtk_entry_get_text (_tmp0_);
-#line 734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp2_ = g_strdup (_tmp1_);
-#line 734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	album_name = _tmp2_;
-#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp4_ = album_name;
-#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp5_ = string_strip (_tmp4_);
-#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp6_ = _tmp5_;
-#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp7_ = g_strcmp0 (_tmp6_, "") == 0;
-#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (_tmp6_);
-#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (_tmp7_) {
-#line 5811 "PicasaPublishing.c"
-		GtkRadioButton* _tmp8_ = NULL;
-		gboolean _tmp9_ = FALSE;
-#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp8_ = self->priv->create_new_radio;
-#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp9_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp3_ = _tmp9_;
-#line 5820 "PicasaPublishing.c"
-	} else {
-#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp3_ = FALSE;
-#line 5824 "PicasaPublishing.c"
-	}
-#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp10_ = self->priv->publish_button;
-#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), !_tmp3_);
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (album_name);
-#line 5832 "PicasaPublishing.c"
-}
-
-
-static void publishing_picasa_publishing_options_pane_on_new_album_entry_changed (PublishingPicasaPublishingOptionsPane* self) {
-#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_picasa_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 5841 "PicasaPublishing.c"
-}
-
-
-static void _vala_array_add13 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+static void _vala_array_add14 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
+#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if ((*length) == (*size)) {
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1);
-#line 5852 "PicasaPublishing.c"
+#line 5010 "PicasaPublishing.c"
 	}
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[*length] = NULL;
-#line 5858 "PicasaPublishing.c"
+#line 5016 "PicasaPublishing.c"
 }
 
 
-static void _vala_array_add14 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+static void _vala_array_add15 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
+#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if ((*length) == (*size)) {
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1);
-#line 5869 "PicasaPublishing.c"
+#line 5027 "PicasaPublishing.c"
 	}
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[*length] = NULL;
-#line 5875 "PicasaPublishing.c"
+#line 5033 "PicasaPublishing.c"
 }
 
 
-static void _vala_array_add15 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
-#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+static void _vala_array_add16 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if ((*length) == (*size)) {
-#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1);
-#line 5886 "PicasaPublishing.c"
+#line 5044 "PicasaPublishing.c"
 	}
-#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[*length] = NULL;
-#line 5892 "PicasaPublishing.c"
+#line 5050 "PicasaPublishing.c"
 }
 
 
-static void _vala_array_add16 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+static void _vala_array_add17 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if ((*length) == (*size)) {
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1);
-#line 5903 "PicasaPublishing.c"
+#line 5061 "PicasaPublishing.c"
 	}
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[*length] = NULL;
-#line 5909 "PicasaPublishing.c"
+#line 5067 "PicasaPublishing.c"
 }
 
 
-static void _vala_array_add17 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+static void _vala_array_add18 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if ((*length) == (*size)) {
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1);
-#line 5920 "PicasaPublishing.c"
+#line 5078 "PicasaPublishing.c"
 	}
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[*length] = NULL;
-#line 5926 "PicasaPublishing.c"
+#line 5084 "PicasaPublishing.c"
 }
 
 
@@ -5982,81 +5128,81 @@ static PublishingPicasaPublishingOptionsPaneSizeDescription** publishing_picasa_
 	PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp15_ = NULL;
 	PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp16_ = NULL;
 	gint _tmp16__length1 = 0;
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
-#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = g_new0 (PublishingPicasaPublishingOptionsPaneSizeDescription*, 0 + 1);
-#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_result_ = _tmp0_;
-#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_result__length1 = 0;
-#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	__result__size_ = _result__length1;
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = _result_;
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1__length1 = _result__length1;
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = _ ("Small (640 × 480 pixels)");
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 610 "/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"
-	_vala_array_add13 (&_result_, &_result__length1, &__result__size_, _tmp3_);
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_vala_array_add14 (&_result_, &_result__length1, &__result__size_, _tmp3_);
+#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4_ = _result_;
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4__length1 = _result__length1;
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp5_ = _ ("Medium (1024 × 768 pixels)");
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 611 "/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"
-	_vala_array_add14 (&_result_, &_result__length1, &__result__size_, _tmp6_);
-#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_vala_array_add15 (&_result_, &_result__length1, &__result__size_, _tmp6_);
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp7_ = _result_;
-#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp7__length1 = _result__length1;
-#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp8_ = _ ("Recommended (1600 × 1200 pixels)");
-#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 612 "/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"
-	_vala_array_add15 (&_result_, &_result__length1, &__result__size_, _tmp9_);
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_vala_array_add16 (&_result_, &_result__length1, &__result__size_, _tmp9_);
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp10_ = _result_;
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp10__length1 = _result__length1;
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp11_ = _ ("Google+ (2048 × 1536 pixels)");
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 613 "/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"
-	_vala_array_add16 (&_result_, &_result__length1, &__result__size_, _tmp12_);
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_vala_array_add17 (&_result_, &_result__length1, &__result__size_, _tmp12_);
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp13_ = _result_;
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp13__length1 = _result__length1;
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp14_ = _ ("Original Size");
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp15_ = publishing_picasa_publishing_options_pane_size_description_new (_tmp14_, PUBLISHING_PICASA_PUBLISHING_PARAMETERS_ORIGINAL_SIZE);
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_vala_array_add17 (&_result_, &_result__length1, &__result__size_, _tmp15_);
-#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_vala_array_add18 (&_result_, &_result__length1, &__result__size_, _tmp15_);
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp16_ = _result_;
-#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp16__length1 = _result__length1;
-#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (result_length1) {
-#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*result_length1 = _tmp16__length1;
-#line 6026 "PicasaPublishing.c"
+#line 5184 "PicasaPublishing.c"
 	}
-#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = _tmp16_;
-#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 6032 "PicasaPublishing.c"
+#line 5190 "PicasaPublishing.c"
 }
 
 
@@ -6071,41 +5217,40 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
 	PublishingPicasaAlbum** _tmp4_ = NULL;
 	gint albums_length1 = 0;
 	gint _albums_size_ = 0;
-	PublishingPicasaAlbum** _tmp27_ = NULL;
-	gint _tmp27__length1 = 0;
-#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	gint _tmp33_ = 0;
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	default_album_id = -1;
-#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = self->priv->parameters;
-#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = publishing_picasa_publishing_parameters_get_target_album_name (_tmp0_);
-#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	last_album = _tmp1_;
-#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = self->priv->parameters;
-#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4_ = publishing_picasa_publishing_parameters_get_albums (_tmp2_, &_tmp3_);
-#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	albums = _tmp4_;
-#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	albums_length1 = _tmp3_;
-#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_albums_size_ = albums_length1;
-#line 6069 "PicasaPublishing.c"
+#line 5226 "PicasaPublishing.c"
 	{
 		gint i = 0;
-#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		i = 0;
-#line 6074 "PicasaPublishing.c"
+#line 5231 "PicasaPublishing.c"
 		{
 			gboolean _tmp5_ = FALSE;
-#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_tmp5_ = TRUE;
-#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			while (TRUE) {
-#line 6081 "PicasaPublishing.c"
+#line 5238 "PicasaPublishing.c"
 				gint _tmp7_ = 0;
 				PublishingPicasaAlbum** _tmp8_ = NULL;
 				gint _tmp8__length1 = 0;
@@ -6122,209 +5267,158 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
 				PublishingPicasaAlbum* _tmp17_ = NULL;
 				const gchar* _tmp18_ = NULL;
 				const gchar* _tmp19_ = NULL;
-#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				if (!_tmp5_) {
-#line 6100 "PicasaPublishing.c"
+#line 5257 "PicasaPublishing.c"
 					gint _tmp6_ = 0;
-#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp6_ = i;
-#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					i = _tmp6_ + 1;
-#line 6106 "PicasaPublishing.c"
+#line 5263 "PicasaPublishing.c"
 				}
-#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp5_ = FALSE;
-#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp7_ = i;
-#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp8_ = albums;
-#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp8__length1 = albums_length1;
-#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				if (!(_tmp7_ < _tmp8__length1)) {
-#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					break;
-#line 6120 "PicasaPublishing.c"
+#line 5277 "PicasaPublishing.c"
 				}
-#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp9_ = self->priv->existing_albums_combo;
-#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp10_ = albums;
-#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp10__length1 = albums_length1;
-#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp11_ = i;
-#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp12_ = _tmp10_[_tmp11_];
-#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp13_ = _tmp12_->name;
-#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				gtk_combo_box_text_append_text (_tmp9_, _tmp13_);
-#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp15_ = albums;
-#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp15__length1 = albums_length1;
-#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp16_ = i;
-#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp17_ = _tmp15_[_tmp16_];
-#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp18_ = _tmp17_->name;
-#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp19_ = last_album;
-#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				if (g_strcmp0 (_tmp18_, _tmp19_) == 0) {
-#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp14_ = TRUE;
-#line 6152 "PicasaPublishing.c"
+#line 5309 "PicasaPublishing.c"
 				} else {
 					gboolean _tmp20_ = FALSE;
-					PublishingPicasaAlbum** _tmp21_ = NULL;
-					gint _tmp21__length1 = 0;
-					gint _tmp22_ = 0;
-					PublishingPicasaAlbum* _tmp23_ = NULL;
-					const gchar* _tmp24_ = NULL;
-#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp21_ = albums;
-#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp21__length1 = albums_length1;
-#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp22_ = i;
-#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp23_ = _tmp21_[_tmp22_];
-#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp24_ = _tmp23_->name;
-#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					if (g_strcmp0 (_tmp24_, PUBLISHING_PICASA_DEFAULT_ALBUM_NAME) == 0) {
-#line 6172 "PicasaPublishing.c"
-						gint _tmp25_ = 0;
-#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp25_ = default_album_id;
-#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp20_ = _tmp25_ == -1;
-#line 6178 "PicasaPublishing.c"
+					gboolean _tmp21_ = FALSE;
+					PublishingPicasaAlbum** _tmp22_ = NULL;
+					gint _tmp22__length1 = 0;
+					gint _tmp23_ = 0;
+					PublishingPicasaAlbum* _tmp24_ = NULL;
+					const gchar* _tmp25_ = NULL;
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+					_tmp22_ = albums;
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+					_tmp22__length1 = albums_length1;
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+					_tmp23_ = i;
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+					_tmp24_ = _tmp22_[_tmp23_];
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+					_tmp25_ = _tmp24_->name;
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+					if (g_strcmp0 (_tmp25_, PUBLISHING_PICASA_DEFAULT_ALBUM_NAME) == 0) {
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+						_tmp21_ = TRUE;
+#line 5332 "PicasaPublishing.c"
 					} else {
-#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+						PublishingPicasaAlbum** _tmp26_ = NULL;
+						gint _tmp26__length1 = 0;
+						gint _tmp27_ = 0;
+						PublishingPicasaAlbum* _tmp28_ = NULL;
+						const gchar* _tmp29_ = NULL;
+						const gchar* _tmp30_ = NULL;
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+						_tmp26_ = albums;
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+						_tmp26__length1 = albums_length1;
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+						_tmp27_ = i;
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+						_tmp28_ = _tmp26_[_tmp27_];
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+						_tmp29_ = _tmp28_->name;
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+						_tmp30_ = _ ("Default album");
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+						_tmp21_ = g_strcmp0 (_tmp29_, _tmp30_) == 0;
+#line 5354 "PicasaPublishing.c"
+					}
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+					if (_tmp21_) {
+#line 5358 "PicasaPublishing.c"
+						gint _tmp31_ = 0;
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+						_tmp31_ = default_album_id;
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+						_tmp20_ = _tmp31_ == -1;
+#line 5364 "PicasaPublishing.c"
+					} else {
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp20_ = FALSE;
-#line 6182 "PicasaPublishing.c"
+#line 5368 "PicasaPublishing.c"
 					}
-#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp14_ = _tmp20_;
-#line 6186 "PicasaPublishing.c"
+#line 5372 "PicasaPublishing.c"
 				}
-#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				if (_tmp14_) {
-#line 6190 "PicasaPublishing.c"
-					gint _tmp26_ = 0;
-#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp26_ = i;
-#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					default_album_id = _tmp26_;
-#line 6196 "PicasaPublishing.c"
+#line 5376 "PicasaPublishing.c"
+					gint _tmp32_ = 0;
+#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+					_tmp32_ = i;
+#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+					default_album_id = _tmp32_;
+#line 5382 "PicasaPublishing.c"
 				}
 			}
 		}
 	}
-#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp27_ = albums;
-#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp27__length1 = albums_length1;
-#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (_tmp27__length1 == 0) {
-#line 6207 "PicasaPublishing.c"
-		GtkComboBoxText* _tmp28_ = NULL;
-		GtkRadioButton* _tmp29_ = NULL;
-		GtkRadioButton* _tmp30_ = NULL;
-		GtkEntry* _tmp31_ = NULL;
-		GtkEntry* _tmp32_ = NULL;
-#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp28_ = self->priv->existing_albums_combo;
-#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp29_ = self->priv->use_existing_radio;
-#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp30_ = self->priv->create_new_radio;
-#line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp31_ = self->priv->new_album_entry;
-#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget));
-#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp32_ = self->priv->new_album_entry;
-#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		gtk_entry_set_text (_tmp32_, PUBLISHING_PICASA_DEFAULT_ALBUM_NAME);
-#line 6233 "PicasaPublishing.c"
-	} else {
-		gint _tmp33_ = 0;
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp33_ = default_album_id;
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		if (_tmp33_ >= 0) {
-#line 6240 "PicasaPublishing.c"
-			GtkRadioButton* _tmp34_ = NULL;
-			GtkComboBoxText* _tmp35_ = NULL;
-			gint _tmp36_ = 0;
-			GtkEntry* _tmp37_ = NULL;
-			GtkCheckButton* _tmp38_ = NULL;
-#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp34_ = self->priv->use_existing_radio;
-#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp35_ = self->priv->existing_albums_combo;
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp36_ = default_album_id;
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_combo_box_get_type (), GtkComboBox), _tmp36_);
-#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp37_ = self->priv->new_album_entry;
-#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp38_ = self->priv->public_check;
-#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 6264 "PicasaPublishing.c"
-		} else {
-			GtkRadioButton* _tmp39_ = NULL;
-			GtkComboBoxText* _tmp40_ = NULL;
-			GtkEntry* _tmp41_ = NULL;
-			GtkEntry* _tmp42_ = NULL;
-			GtkCheckButton* _tmp43_ = NULL;
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp39_ = self->priv->create_new_radio;
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp40_ = self->priv->existing_albums_combo;
-#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp41_ = self->priv->new_album_entry;
-#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			gtk_entry_set_text (_tmp41_, PUBLISHING_PICASA_DEFAULT_ALBUM_NAME);
-#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp42_ = self->priv->new_album_entry;
-#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget));
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp43_ = self->priv->public_check;
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 6291 "PicasaPublishing.c"
-		}
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp33_ = default_album_id;
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	if (_tmp33_ >= 0) {
+#line 5391 "PicasaPublishing.c"
+		GtkComboBoxText* _tmp34_ = NULL;
+		gint _tmp35_ = 0;
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp34_ = self->priv->existing_albums_combo;
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp35_ = default_album_id;
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_combo_box_get_type (), GtkComboBox), _tmp35_);
+#line 5400 "PicasaPublishing.c"
 	}
-#line 788 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_picasa_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	albums = (_vala_array_free (albums, albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (last_album);
-#line 6300 "PicasaPublishing.c"
+#line 5406 "PicasaPublishing.c"
 }
 
 
@@ -6333,48 +5427,48 @@ static GtkWidget* publishing_picasa_publishing_options_pane_real_get_widget (Spi
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_ = NULL;
 	GtkWidget* _tmp1_ = NULL;
-#line 791 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPicasaPublishingOptionsPane);
-#line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = self->priv->pane_widget;
-#line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = _tmp1_;
-#line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 6319 "PicasaPublishing.c"
+#line 5425 "PicasaPublishing.c"
 }
 
 
 static SpitPublishingDialogPaneGeometryOptions publishing_picasa_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
 	PublishingPicasaPublishingOptionsPane * self;
 	SpitPublishingDialogPaneGeometryOptions result = 0;
-#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPicasaPublishingOptionsPane);
-#line 796 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 796 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 6332 "PicasaPublishing.c"
+#line 5438 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
 	PublishingPicasaPublishingOptionsPane * self;
-#line 799 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPicasaPublishingOptionsPane);
-#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_publishing_options_pane_installed (self);
-#line 6342 "PicasaPublishing.c"
+#line 5448 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
 	PublishingPicasaPublishingOptionsPane * self;
-#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPicasaPublishingOptionsPane);
-#line 6350 "PicasaPublishing.c"
+#line 5456 "PicasaPublishing.c"
 }
 
 
@@ -6383,240 +5477,240 @@ static PublishingPicasaPublishingOptionsPaneSizeDescription* publishing_picasa_p
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = (PublishingPicasaPublishingOptionsPaneSizeDescription*) g_type_create_instance (object_type);
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = name;
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->name);
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->name = _tmp1_;
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = major_axis_pixels;
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->major_axis_pixels = _tmp2_;
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 6377 "PicasaPublishing.c"
+#line 5483 "PicasaPublishing.c"
 }
 
 
 static PublishingPicasaPublishingOptionsPaneSizeDescription* publishing_picasa_publishing_options_pane_size_description_new (const gchar* name, gint major_axis_pixels) {
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return publishing_picasa_publishing_options_pane_size_description_construct (PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_DESCRIPTION, name, major_axis_pixels);
-#line 6384 "PicasaPublishing.c"
+#line 5490 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_publishing_options_pane_value_size_description_init (GValue* value) {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 6391 "PicasaPublishing.c"
+#line 5497 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_publishing_options_pane_value_size_description_free_value (GValue* value) {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_publishing_options_pane_size_description_unref (value->data[0].v_pointer);
-#line 6400 "PicasaPublishing.c"
+#line 5506 "PicasaPublishing.c"
 	}
 }
 
 
 static void publishing_picasa_publishing_options_pane_value_size_description_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_picasa_publishing_options_pane_size_description_ref (src_value->data[0].v_pointer);
-#line 6410 "PicasaPublishing.c"
+#line 5516 "PicasaPublishing.c"
 	} else {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 6414 "PicasaPublishing.c"
+#line 5520 "PicasaPublishing.c"
 	}
 }
 
 
 static gpointer publishing_picasa_publishing_options_pane_value_size_description_peek_pointer (const GValue* value) {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return value->data[0].v_pointer;
-#line 6422 "PicasaPublishing.c"
+#line 5528 "PicasaPublishing.c"
 }
 
 
 static gchar* publishing_picasa_publishing_options_pane_value_size_description_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 6429 "PicasaPublishing.c"
+#line 5535 "PicasaPublishing.c"
 		PublishingPicasaPublishingOptionsPaneSizeDescription* object;
 		object = collect_values[0].v_pointer;
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6436 "PicasaPublishing.c"
+#line 5542 "PicasaPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.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 6440 "PicasaPublishing.c"
+#line 5546 "PicasaPublishing.c"
 		}
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = publishing_picasa_publishing_options_pane_size_description_ref (object);
-#line 6444 "PicasaPublishing.c"
+#line 5550 "PicasaPublishing.c"
 	} else {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 6448 "PicasaPublishing.c"
+#line 5554 "PicasaPublishing.c"
 	}
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return NULL;
-#line 6452 "PicasaPublishing.c"
+#line 5558 "PicasaPublishing.c"
 }
 
 
 static gchar* publishing_picasa_publishing_options_pane_value_size_description_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingPicasaPublishingOptionsPaneSizeDescription** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!object_p) {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 6463 "PicasaPublishing.c"
+#line 5569 "PicasaPublishing.c"
 	}
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = NULL;
-#line 6469 "PicasaPublishing.c"
+#line 5575 "PicasaPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 6473 "PicasaPublishing.c"
+#line 5579 "PicasaPublishing.c"
 	} else {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = publishing_picasa_publishing_options_pane_size_description_ref (value->data[0].v_pointer);
-#line 6477 "PicasaPublishing.c"
+#line 5583 "PicasaPublishing.c"
 	}
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return NULL;
-#line 6481 "PicasaPublishing.c"
+#line 5587 "PicasaPublishing.c"
 }
 
 
 static GParamSpec* publishing_picasa_publishing_options_pane_param_spec_size_description (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingPicasaPublishingOptionsPaneParamSpecSizeDescription* spec;
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_DESCRIPTION), NULL);
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 6495 "PicasaPublishing.c"
+#line 5601 "PicasaPublishing.c"
 }
 
 
 static gpointer publishing_picasa_publishing_options_pane_value_get_size_description (const GValue* value) {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_DESCRIPTION), NULL);
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return value->data[0].v_pointer;
-#line 6504 "PicasaPublishing.c"
+#line 5610 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_publishing_options_pane_value_set_size_description (GValue* value, gpointer v_object) {
 	PublishingPicasaPublishingOptionsPaneSizeDescription* old;
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_DESCRIPTION));
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (v_object) {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_DESCRIPTION));
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_publishing_options_pane_size_description_ref (value->data[0].v_pointer);
-#line 6524 "PicasaPublishing.c"
+#line 5630 "PicasaPublishing.c"
 	} else {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 6528 "PicasaPublishing.c"
+#line 5634 "PicasaPublishing.c"
 	}
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (old) {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_publishing_options_pane_size_description_unref (old);
-#line 6534 "PicasaPublishing.c"
+#line 5640 "PicasaPublishing.c"
 	}
 }
 
 
 static void publishing_picasa_publishing_options_pane_value_take_size_description (GValue* value, gpointer v_object) {
 	PublishingPicasaPublishingOptionsPaneSizeDescription* old;
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_DESCRIPTION));
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (v_object) {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_DESCRIPTION));
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 6553 "PicasaPublishing.c"
+#line 5659 "PicasaPublishing.c"
 	} else {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 6557 "PicasaPublishing.c"
+#line 5663 "PicasaPublishing.c"
 	}
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (old) {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_publishing_options_pane_size_description_unref (old);
-#line 6563 "PicasaPublishing.c"
+#line 5669 "PicasaPublishing.c"
 	}
 }
 
 
 static void publishing_picasa_publishing_options_pane_size_description_class_init (PublishingPicasaPublishingOptionsPaneSizeDescriptionClass * klass) {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_publishing_options_pane_size_description_parent_class = g_type_class_peek_parent (klass);
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	((PublishingPicasaPublishingOptionsPaneSizeDescriptionClass *) klass)->finalize = publishing_picasa_publishing_options_pane_size_description_finalize;
-#line 6573 "PicasaPublishing.c"
+#line 5679 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_publishing_options_pane_size_description_instance_init (PublishingPicasaPublishingOptionsPaneSizeDescription * self) {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->ref_count = 1;
-#line 6580 "PicasaPublishing.c"
+#line 5686 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_publishing_options_pane_size_description_finalize (PublishingPicasaPublishingOptionsPaneSizeDescription* obj) {
 	PublishingPicasaPublishingOptionsPaneSizeDescription * self;
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_DESCRIPTION, PublishingPicasaPublishingOptionsPaneSizeDescription);
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->name);
-#line 6592 "PicasaPublishing.c"
+#line 5698 "PicasaPublishing.c"
 }
 
 
@@ -6637,128 +5731,116 @@ static GType publishing_picasa_publishing_options_pane_size_description_get_type
 static gpointer publishing_picasa_publishing_options_pane_size_description_ref (gpointer instance) {
 	PublishingPicasaPublishingOptionsPaneSizeDescription* self;
 	self = instance;
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return instance;
-#line 6617 "PicasaPublishing.c"
+#line 5723 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_publishing_options_pane_size_description_unref (gpointer instance) {
 	PublishingPicasaPublishingOptionsPaneSizeDescription* self;
 	self = instance;
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_SIZE_DESCRIPTION_GET_CLASS (self)->finalize (self);
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 6630 "PicasaPublishing.c"
+#line 5736 "PicasaPublishing.c"
 	}
 }
 
 
 static void publishing_picasa_publishing_options_pane_class_init (PublishingPicasaPublishingOptionsPaneClass * klass) {
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_publishing_options_pane_parent_class = g_type_class_peek_parent (klass);
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingPicasaPublishingOptionsPanePrivate));
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_picasa_publishing_options_pane_finalize;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_new ("publish", PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_new ("logout", PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 6646 "PicasaPublishing.c"
+#line 5752 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_picasa_publishing_options_pane_real_get_widget;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_picasa_publishing_options_pane_real_get_preferred_geometry;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_picasa_publishing_options_pane_real_on_pane_installed;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_picasa_publishing_options_pane_real_on_pane_uninstalled;
-#line 6661 "PicasaPublishing.c"
+#line 5767 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_publishing_options_pane_instance_init (PublishingPicasaPublishingOptionsPane * self) {
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv = PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->builder = NULL;
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->pane_widget = NULL;
-#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->login_identity_label = NULL;
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->publish_to_label = NULL;
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->use_existing_radio = NULL;
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->existing_albums_combo = NULL;
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->create_new_radio = NULL;
-#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->new_album_entry = NULL;
-#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->public_check = NULL;
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->size_combo = NULL;
-#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->strip_metadata_check = NULL;
-#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->publish_button = NULL;
-#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->logout_button = NULL;
-#line 6694 "PicasaPublishing.c"
+#line 5794 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_publishing_options_pane_finalize (GObject* obj) {
 	PublishingPicasaPublishingOptionsPane * self;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPicasaPublishingOptionsPane);
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->pane_widget);
-#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->login_identity_label);
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->publish_to_label);
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_object_unref0 (self->priv->use_existing_radio);
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->existing_albums_combo);
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_object_unref0 (self->priv->create_new_radio);
-#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_object_unref0 (self->priv->new_album_entry);
-#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->public_check);
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->size_combo);
-#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->strip_metadata_check);
-#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->publish_button);
-#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->logout_button);
-#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->size_descriptions = (_vala_array_free (self->priv->size_descriptions, self->priv->size_descriptions_length1, (GDestroyNotify) publishing_picasa_publishing_options_pane_size_description_unref), NULL);
-#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_picasa_publishing_parameters_unref0 (self->priv->parameters);
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	G_OBJECT_CLASS (publishing_picasa_publishing_options_pane_parent_class)->finalize (obj);
-#line 6734 "PicasaPublishing.c"
+#line 5828 "PicasaPublishing.c"
 }
 
 
@@ -6779,106 +5861,50 @@ GType publishing_picasa_publishing_options_pane_get_type (void) {
 PublishingPicasaPublishingParameters* publishing_picasa_publishing_parameters_construct (GType object_type) {
 	PublishingPicasaPublishingParameters* self = NULL;
 	gchar* _tmp0_ = NULL;
-#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = (PublishingPicasaPublishingParameters*) g_type_create_instance (object_type);
-#line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = g_strdup ("[unknown]");
-#line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->priv->user_name);
-#line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->user_name = _tmp0_;
-#line 823 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->priv->target_album_name);
-#line 823 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->target_album_name = NULL;
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->major_axis_size_selection_id = 0;
-#line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->major_axis_size_pixels = PUBLISHING_PICASA_PUBLISHING_PARAMETERS_ORIGINAL_SIZE;
-#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 673 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->priv->target_album_url);
-#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 673 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->target_album_url = NULL;
-#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->album_public = FALSE;
-#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->albums = (_vala_array_free (self->priv->albums, self->priv->albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->albums = NULL;
-#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->albums_length1 = 0;
-#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->_albums_size_ = self->priv->albums_length1;
-#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->strip_metadata = FALSE;
-#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->media_type = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO;
-#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->to_new_album = TRUE;
-#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 6793 "PicasaPublishing.c"
+#line 5885 "PicasaPublishing.c"
 }
 
 
 PublishingPicasaPublishingParameters* publishing_picasa_publishing_parameters_new (void) {
-#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return publishing_picasa_publishing_parameters_construct (PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS);
-#line 6800 "PicasaPublishing.c"
-}
-
-
-gboolean publishing_picasa_publishing_parameters_is_to_new_album (PublishingPicasaPublishingParameters* self) {
-	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self), FALSE);
-#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = self->priv->to_new_album;
-#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	result = _tmp0_;
-#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	return result;
-#line 6815 "PicasaPublishing.c"
-}
-
-
-void publishing_picasa_publishing_parameters_set_is_to_new_album (PublishingPicasaPublishingParameters* self, gboolean to_new_album) {
-	gboolean _tmp0_ = FALSE;
-#line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
-#line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = to_new_album;
-#line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->to_new_album = _tmp0_;
-#line 6827 "PicasaPublishing.c"
-}
-
-
-void publishing_picasa_publishing_parameters_set_is_new_album_public (PublishingPicasaPublishingParameters* self, gboolean album_public) {
-	gboolean _tmp0_ = FALSE;
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
-#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = album_public;
-#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->album_public = _tmp0_;
-#line 6839 "PicasaPublishing.c"
-}
-
-
-gboolean publishing_picasa_publishing_parameters_is_new_album_public (PublishingPicasaPublishingParameters* self) {
-	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self), FALSE);
-#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = self->priv->album_public;
-#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	result = _tmp0_;
-#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	return result;
-#line 6854 "PicasaPublishing.c"
+#line 5892 "PicasaPublishing.c"
 }
 
 
@@ -6886,55 +5912,55 @@ gchar* publishing_picasa_publishing_parameters_get_target_album_name (Publishing
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self), NULL);
-#line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = self->priv->target_album_name;
-#line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = _tmp1_;
-#line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 6872 "PicasaPublishing.c"
+#line 5910 "PicasaPublishing.c"
 }
 
 
 void publishing_picasa_publishing_parameters_set_target_album_name (PublishingPicasaPublishingParameters* self, const gchar* target_album_name) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (target_album_name != NULL);
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = target_album_name;
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->priv->target_album_name);
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->target_album_name = _tmp1_;
-#line 6891 "PicasaPublishing.c"
+#line 5929 "PicasaPublishing.c"
 }
 
 
 void publishing_picasa_publishing_parameters_set_target_album_entry_url (PublishingPicasaPublishingParameters* self, const gchar* target_album_url) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (target_album_url != NULL);
-#line 859 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = target_album_url;
-#line 859 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 859 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->priv->target_album_url);
-#line 859 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->target_album_url = _tmp1_;
-#line 6910 "PicasaPublishing.c"
+#line 5948 "PicasaPublishing.c"
 }
 
 
@@ -6942,17 +5968,17 @@ gchar* publishing_picasa_publishing_parameters_get_target_album_entry_url (Publi
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self), NULL);
-#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = self->priv->target_album_url;
-#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = _tmp1_;
-#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 6928 "PicasaPublishing.c"
+#line 5966 "PicasaPublishing.c"
 }
 
 
@@ -6965,7 +5991,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 6941 "PicasaPublishing.c"
+#line 5979 "PicasaPublishing.c"
 	{
 		GRegex* regex = NULL;
 		const gchar* _tmp0_ = NULL;
@@ -6996,8 +6022,8 @@ 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 6972 "PicasaPublishing.c"
-				goto __catch15_g_regex_error;
+#line 6010 "PicasaPublishing.c"
+				goto __catch12_g_regex_error;
 			}
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7005,7 +6031,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 6981 "PicasaPublishing.c"
+#line 6019 "PicasaPublishing.c"
 		}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
@@ -7021,8 +6047,8 @@ 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 6997 "PicasaPublishing.c"
-				goto __catch15_g_regex_error;
+#line 6035 "PicasaPublishing.c"
+				goto __catch12_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -7032,7 +6058,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 7008 "PicasaPublishing.c"
+#line 6046 "PicasaPublishing.c"
 		}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
@@ -7046,10 +6072,10 @@ 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 7022 "PicasaPublishing.c"
+#line 6060 "PicasaPublishing.c"
 	}
-	goto __finally15;
-	__catch15_g_regex_error:
+	goto __finally12;
+	__catch12_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -7060,9 +6086,9 @@ 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 7036 "PicasaPublishing.c"
+#line 6074 "PicasaPublishing.c"
 	}
-	__finally15:
+	__finally12:
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -7071,7 +6097,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 7047 "PicasaPublishing.c"
+#line 6085 "PicasaPublishing.c"
 	}
 }
 
@@ -7082,23 +6108,23 @@ gchar* publishing_picasa_publishing_parameters_get_target_album_feed_url (Publis
 	gchar* _tmp0_ = NULL;
 	gchar* feed_url = NULL;
 	gchar* _tmp1_ = NULL;
-#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self), NULL);
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = publishing_picasa_publishing_parameters_get_target_album_entry_url (self);
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	entry_url = _tmp0_;
-#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = string_replace (entry_url, "entry", "feed");
-#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	feed_url = _tmp1_;
-#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = feed_url;
-#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (entry_url);
-#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 7074 "PicasaPublishing.c"
+#line 6112 "PicasaPublishing.c"
 }
 
 
@@ -7106,64 +6132,64 @@ gchar* publishing_picasa_publishing_parameters_get_user_name (PublishingPicasaPu
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self), NULL);
-#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = self->priv->user_name;
-#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = _tmp1_;
-#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 7092 "PicasaPublishing.c"
+#line 6130 "PicasaPublishing.c"
 }
 
 
 void publishing_picasa_publishing_parameters_set_user_name (PublishingPicasaPublishingParameters* self, const gchar* user_name) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
-#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (user_name != NULL);
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = user_name;
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->priv->user_name);
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->user_name = _tmp1_;
-#line 7111 "PicasaPublishing.c"
+#line 6149 "PicasaPublishing.c"
 }
 
 
 static gpointer _publishing_picasa_album_ref0 (gpointer self) {
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self ? publishing_picasa_album_ref (self) : NULL;
-#line 7118 "PicasaPublishing.c"
+#line 6156 "PicasaPublishing.c"
 }
 
 
 static PublishingPicasaAlbum** _vala_array_dup5 (PublishingPicasaAlbum** self, int length) {
 	PublishingPicasaAlbum** result;
 	int i;
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = g_new0 (PublishingPicasaAlbum*, length + 1);
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 7129 "PicasaPublishing.c"
+#line 6167 "PicasaPublishing.c"
 		PublishingPicasaAlbum* _tmp0_ = NULL;
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp0_ = _publishing_picasa_album_ref0 (self[i]);
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		result[i] = _tmp0_;
-#line 7135 "PicasaPublishing.c"
+#line 6173 "PicasaPublishing.c"
 	}
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 7139 "PicasaPublishing.c"
+#line 6177 "PicasaPublishing.c"
 }
 
 
@@ -7175,52 +6201,52 @@ PublishingPicasaAlbum** publishing_picasa_publishing_parameters_get_albums (Publ
 	gint _tmp1__length1 = 0;
 	PublishingPicasaAlbum** _tmp2_ = NULL;
 	gint _tmp2__length1 = 0;
-#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self), NULL);
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = self->priv->albums;
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0__length1 = self->priv->albums_length1;
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup5 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1__length1 = _tmp0__length1;
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = _tmp1_;
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2__length1 = _tmp1__length1;
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (result_length1) {
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*result_length1 = _tmp2__length1;
-#line 7169 "PicasaPublishing.c"
+#line 6207 "PicasaPublishing.c"
 	}
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = _tmp2_;
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 7175 "PicasaPublishing.c"
+#line 6213 "PicasaPublishing.c"
 }
 
 
 static PublishingPicasaAlbum** _vala_array_dup6 (PublishingPicasaAlbum** self, int length) {
 	PublishingPicasaAlbum** result;
 	int i;
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = g_new0 (PublishingPicasaAlbum*, length + 1);
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 7186 "PicasaPublishing.c"
+#line 6224 "PicasaPublishing.c"
 		PublishingPicasaAlbum* _tmp0_ = NULL;
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp0_ = _publishing_picasa_album_ref0 (self[i]);
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		result[i] = _tmp0_;
-#line 7192 "PicasaPublishing.c"
+#line 6230 "PicasaPublishing.c"
 	}
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 7196 "PicasaPublishing.c"
+#line 6234 "PicasaPublishing.c"
 }
 
 
@@ -7229,351 +6255,351 @@ void publishing_picasa_publishing_parameters_set_albums (PublishingPicasaPublish
 	gint _tmp0__length1 = 0;
 	PublishingPicasaAlbum** _tmp1_ = NULL;
 	gint _tmp1__length1 = 0;
-#line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = albums;
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0__length1 = albums_length1;
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup6 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1__length1 = _tmp0__length1;
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->albums = (_vala_array_free (self->priv->albums, self->priv->albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->albums = _tmp1_;
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->albums_length1 = _tmp1__length1;
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->_albums_size_ = self->priv->albums_length1;
-#line 7223 "PicasaPublishing.c"
+#line 6261 "PicasaPublishing.c"
 }
 
 
 void publishing_picasa_publishing_parameters_set_major_axis_size_pixels (PublishingPicasaPublishingParameters* self, gint pixels) {
 	gint _tmp0_ = 0;
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
-#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = pixels;
-#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->major_axis_size_pixels = _tmp0_;
-#line 7235 "PicasaPublishing.c"
+#line 6273 "PicasaPublishing.c"
 }
 
 
 gint publishing_picasa_publishing_parameters_get_major_axis_size_pixels (PublishingPicasaPublishingParameters* self) {
 	gint result = 0;
 	gint _tmp0_ = 0;
-#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self), 0);
-#line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = self->priv->major_axis_size_pixels;
-#line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = _tmp0_;
-#line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 7250 "PicasaPublishing.c"
+#line 6288 "PicasaPublishing.c"
 }
 
 
 void publishing_picasa_publishing_parameters_set_major_axis_size_selection_id (PublishingPicasaPublishingParameters* self, gint selection_id) {
 	gint _tmp0_ = 0;
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = selection_id;
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->major_axis_size_selection_id = _tmp0_;
-#line 7262 "PicasaPublishing.c"
+#line 6300 "PicasaPublishing.c"
 }
 
 
 gint publishing_picasa_publishing_parameters_get_major_axis_size_selection_id (PublishingPicasaPublishingParameters* self) {
 	gint result = 0;
 	gint _tmp0_ = 0;
-#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self), 0);
-#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = self->priv->major_axis_size_selection_id;
-#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = _tmp0_;
-#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 7277 "PicasaPublishing.c"
+#line 6315 "PicasaPublishing.c"
 }
 
 
 void publishing_picasa_publishing_parameters_set_strip_metadata (PublishingPicasaPublishingParameters* self, gboolean strip_metadata) {
 	gboolean _tmp0_ = FALSE;
-#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
-#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = strip_metadata;
-#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->strip_metadata = _tmp0_;
-#line 7289 "PicasaPublishing.c"
+#line 6327 "PicasaPublishing.c"
 }
 
 
 gboolean publishing_picasa_publishing_parameters_get_strip_metadata (PublishingPicasaPublishingParameters* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self), FALSE);
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = self->priv->strip_metadata;
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = _tmp0_;
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 7304 "PicasaPublishing.c"
+#line 6342 "PicasaPublishing.c"
 }
 
 
 void publishing_picasa_publishing_parameters_set_media_type (PublishingPicasaPublishingParameters* self, SpitPublishingPublisherMediaType media_type) {
 	SpitPublishingPublisherMediaType _tmp0_ = 0;
-#line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = media_type;
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->media_type = _tmp0_;
-#line 7316 "PicasaPublishing.c"
+#line 6354 "PicasaPublishing.c"
 }
 
 
 SpitPublishingPublisherMediaType publishing_picasa_publishing_parameters_get_media_type (PublishingPicasaPublishingParameters* self) {
 	SpitPublishingPublisherMediaType result = 0;
 	SpitPublishingPublisherMediaType _tmp0_ = 0;
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self), 0);
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = self->priv->media_type;
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = _tmp0_;
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 7331 "PicasaPublishing.c"
+#line 6369 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_value_publishing_parameters_init (GValue* value) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 7338 "PicasaPublishing.c"
+#line 6376 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_value_publishing_parameters_free_value (GValue* value) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_publishing_parameters_unref (value->data[0].v_pointer);
-#line 7347 "PicasaPublishing.c"
+#line 6385 "PicasaPublishing.c"
 	}
 }
 
 
 static void publishing_picasa_value_publishing_parameters_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_picasa_publishing_parameters_ref (src_value->data[0].v_pointer);
-#line 7357 "PicasaPublishing.c"
+#line 6395 "PicasaPublishing.c"
 	} else {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 7361 "PicasaPublishing.c"
+#line 6399 "PicasaPublishing.c"
 	}
 }
 
 
 static gpointer publishing_picasa_value_publishing_parameters_peek_pointer (const GValue* value) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return value->data[0].v_pointer;
-#line 7369 "PicasaPublishing.c"
+#line 6407 "PicasaPublishing.c"
 }
 
 
 static gchar* publishing_picasa_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 7376 "PicasaPublishing.c"
+#line 6414 "PicasaPublishing.c"
 		PublishingPicasaPublishingParameters* object;
 		object = collect_values[0].v_pointer;
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 7383 "PicasaPublishing.c"
+#line 6421 "PicasaPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.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 7387 "PicasaPublishing.c"
+#line 6425 "PicasaPublishing.c"
 		}
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = publishing_picasa_publishing_parameters_ref (object);
-#line 7391 "PicasaPublishing.c"
+#line 6429 "PicasaPublishing.c"
 	} else {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 7395 "PicasaPublishing.c"
+#line 6433 "PicasaPublishing.c"
 	}
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return NULL;
-#line 7399 "PicasaPublishing.c"
+#line 6437 "PicasaPublishing.c"
 }
 
 
 static gchar* publishing_picasa_value_publishing_parameters_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingPicasaPublishingParameters** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!object_p) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 7410 "PicasaPublishing.c"
+#line 6448 "PicasaPublishing.c"
 	}
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = NULL;
-#line 7416 "PicasaPublishing.c"
+#line 6454 "PicasaPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 7420 "PicasaPublishing.c"
+#line 6458 "PicasaPublishing.c"
 	} else {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = publishing_picasa_publishing_parameters_ref (value->data[0].v_pointer);
-#line 7424 "PicasaPublishing.c"
+#line 6462 "PicasaPublishing.c"
 	}
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return NULL;
-#line 7428 "PicasaPublishing.c"
+#line 6466 "PicasaPublishing.c"
 }
 
 
 GParamSpec* publishing_picasa_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingPicasaParamSpecPublishingParameters* spec;
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS), NULL);
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 7442 "PicasaPublishing.c"
+#line 6480 "PicasaPublishing.c"
 }
 
 
 gpointer publishing_picasa_value_get_publishing_parameters (const GValue* value) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS), NULL);
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return value->data[0].v_pointer;
-#line 7451 "PicasaPublishing.c"
+#line 6489 "PicasaPublishing.c"
 }
 
 
 void publishing_picasa_value_set_publishing_parameters (GValue* value, gpointer v_object) {
 	PublishingPicasaPublishingParameters* old;
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS));
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (v_object) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS));
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_publishing_parameters_ref (value->data[0].v_pointer);
-#line 7471 "PicasaPublishing.c"
+#line 6509 "PicasaPublishing.c"
 	} else {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 7475 "PicasaPublishing.c"
+#line 6513 "PicasaPublishing.c"
 	}
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (old) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_publishing_parameters_unref (old);
-#line 7481 "PicasaPublishing.c"
+#line 6519 "PicasaPublishing.c"
 	}
 }
 
 
 void publishing_picasa_value_take_publishing_parameters (GValue* value, gpointer v_object) {
 	PublishingPicasaPublishingParameters* old;
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS));
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (v_object) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS));
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 7500 "PicasaPublishing.c"
+#line 6538 "PicasaPublishing.c"
 	} else {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 7504 "PicasaPublishing.c"
+#line 6542 "PicasaPublishing.c"
 	}
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (old) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_publishing_parameters_unref (old);
-#line 7510 "PicasaPublishing.c"
+#line 6548 "PicasaPublishing.c"
 	}
 }
 
 
 static void publishing_picasa_publishing_parameters_class_init (PublishingPicasaPublishingParametersClass * klass) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_publishing_parameters_parent_class = g_type_class_peek_parent (klass);
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	((PublishingPicasaPublishingParametersClass *) klass)->finalize = publishing_picasa_publishing_parameters_finalize;
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingPicasaPublishingParametersPrivate));
-#line 7522 "PicasaPublishing.c"
+#line 6560 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_publishing_parameters_instance_init (PublishingPicasaPublishingParameters * self) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv = PUBLISHING_PICASA_PUBLISHING_PARAMETERS_GET_PRIVATE (self);
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->ref_count = 1;
-#line 7531 "PicasaPublishing.c"
+#line 6569 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_publishing_parameters_finalize (PublishingPicasaPublishingParameters* obj) {
 	PublishingPicasaPublishingParameters * self;
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS, PublishingPicasaPublishingParameters);
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->priv->target_album_name);
-#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->priv->target_album_url);
-#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->priv->user_name);
-#line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->albums = (_vala_array_free (self->priv->albums, self->priv->albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 7549 "PicasaPublishing.c"
+#line 6587 "PicasaPublishing.c"
 }
 
 
@@ -7594,24 +6620,24 @@ GType publishing_picasa_publishing_parameters_get_type (void) {
 gpointer publishing_picasa_publishing_parameters_ref (gpointer instance) {
 	PublishingPicasaPublishingParameters* self;
 	self = instance;
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return instance;
-#line 7574 "PicasaPublishing.c"
+#line 6612 "PicasaPublishing.c"
 }
 
 
 void publishing_picasa_publishing_parameters_unref (gpointer instance) {
 	PublishingPicasaPublishingParameters* self;
 	self = instance;
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		PUBLISHING_PICASA_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self);
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 7587 "PicasaPublishing.c"
+#line 6625 "PicasaPublishing.c"
 	}
 }
 
@@ -7623,36 +6649,36 @@ PublishingPicasaUploader* publishing_picasa_uploader_construct (GType object_typ
 	gint _tmp1__length1 = 0;
 	PublishingPicasaPublishingParameters* _tmp2_ = NULL;
 	PublishingPicasaPublishingParameters* _tmp3_ = NULL;
-#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
-#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (parameters), NULL);
-#line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = session;
-#line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = publishables;
-#line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1__length1 = publishables_length1;
-#line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = (PublishingPicasaUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp1__length1);
-#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = parameters;
-#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp3_ = _publishing_picasa_publishing_parameters_ref0 (_tmp2_);
-#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_picasa_publishing_parameters_unref0 (self->priv->parameters);
-#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->parameters = _tmp3_;
-#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 7621 "PicasaPublishing.c"
+#line 6659 "PicasaPublishing.c"
 }
 
 
 PublishingPicasaUploader* publishing_picasa_uploader_new (PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingPicasaPublishingParameters* parameters) {
-#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return publishing_picasa_uploader_construct (PUBLISHING_PICASA_TYPE_UPLOADER, session, publishables, publishables_length1, parameters);
-#line 7628 "PicasaPublishing.c"
+#line 6666 "PicasaPublishing.c"
 }
 
 
@@ -7666,65 +6692,65 @@ static PublishingRESTSupportTransaction* publishing_picasa_uploader_real_create_
 	SpitPublishingPublishable* _tmp4_ = NULL;
 	PublishingPicasaUploadTransaction* _tmp5_ = NULL;
 	PublishingRESTSupportTransaction* _tmp6_ = NULL;
-#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_UPLOADER, PublishingPicasaUploader);
-#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = publishing_rest_support_batch_uploader_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_SESSION, PublishingRESTSupportGoogleSession);
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = self->priv->parameters;
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp3_ = publishing_rest_support_batch_uploader_get_current_publishable (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4_ = _tmp3_;
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp5_ = publishing_picasa_upload_transaction_new (_tmp1_, _tmp2_, _tmp4_);
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (_tmp4_);
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_rest_support_session_unref0 (_tmp1_);
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = _tmp6_;
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 7668 "PicasaPublishing.c"
+#line 6706 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_uploader_class_init (PublishingPicasaUploaderClass * klass) {
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_uploader_parent_class = g_type_class_peek_parent (klass);
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->finalize = publishing_picasa_uploader_finalize;
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingPicasaUploaderPrivate));
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = publishing_picasa_uploader_real_create_transaction;
-#line 7681 "PicasaPublishing.c"
+#line 6719 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_uploader_instance_init (PublishingPicasaUploader * self) {
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv = PUBLISHING_PICASA_UPLOADER_GET_PRIVATE (self);
-#line 7688 "PicasaPublishing.c"
+#line 6726 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_uploader_finalize (PublishingRESTSupportBatchUploader* obj) {
 	PublishingPicasaUploader * self;
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PICASA_TYPE_UPLOADER, PublishingPicasaUploader);
-#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_picasa_publishing_parameters_unref0 (self->priv->parameters);
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_picasa_uploader_parent_class)->finalize (obj);
-#line 7700 "PicasaPublishing.c"
+#line 6738 "PicasaPublishing.c"
 }
 
 
diff --git a/plugins/shotwell-publishing/PicasaPublishing.vala b/plugins/shotwell-publishing/PicasaPublishing.vala
index 976ba42..d72ce6d 100644
--- a/plugins/shotwell-publishing/PicasaPublishing.vala
+++ b/plugins/shotwell-publishing/PicasaPublishing.vala
@@ -55,15 +55,14 @@ 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 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 {
+    private const string DEFAULT_ALBUM_FEED_URL = "https://picasaweb.google.com/data/feed/api/user/default/albumid/default";
     private bool running;
     private Spit.Publishing.ProgressCallback progress_reporter;
     private PublishingParameters publishing_parameters;
-    private string? refresh_token;
+    private Spit.Publishing.Authenticator authenticator;
 
     public PicasaPublisher(Spit.Publishing.Service service,
         Spit.Publishing.PluginHost host) {
@@ -77,7 +76,6 @@ public class PicasaPublisher : Publishing.RESTSupport.GooglePublisher {
             media_type |= p.get_media_type();
         publishing_parameters.set_media_type(media_type);
         
-        this.refresh_token = host.get_config_string("refresh_token", null);
         this.progress_reporter = null;
     }
 
@@ -94,6 +92,9 @@ public class PicasaPublisher : Publishing.RESTSupport.GooglePublisher {
             throw new Spit.Publishing.PublishingError.MALFORMED_RESPONSE("response root node " +
                 "isn't a <feed> or <entry>");
 
+        // Add album that will push to the default feed for all the new users
+        result += new Album(_("Default album"), DEFAULT_ALBUM_FEED_URL);
+
         for ( ; doc_node_iter != null; doc_node_iter = doc_node_iter->next) {
             if (doc_node_iter->name != "entry")
                 continue;
@@ -114,6 +115,11 @@ public class PicasaPublisher : Publishing.RESTSupport.GooglePublisher {
                 }
             }
 
+            // If default album is present in the result list, just skip it because we added it on top anyway
+            if (url_val == DEFAULT_ALBUM_FEED_URL) {
+                continue;
+            }
+
             result += new Album(name_val, url_val);
         }
 
@@ -132,19 +138,9 @@ public class PicasaPublisher : Publishing.RESTSupport.GooglePublisher {
         get_host().set_config_string("last-album", parameters.get_target_album_name());
     }
 
-    private void on_service_welcome_login() {
-        debug("EVENT: user clicked 'Login' in welcome pane.");
-
-        if (!is_running())
-            return;
-        
-        start_oauth_flow(refresh_token);
-    }
-
     protected override void on_login_flow_complete() {
         debug("EVENT: OAuth login flow complete.");
 
-        get_host().set_config_string("refresh_token", get_session().get_refresh_token());
 
         publishing_parameters.set_user_name(get_session().get_user_name());
         
@@ -199,66 +195,9 @@ public class PicasaPublisher : Publishing.RESTSupport.GooglePublisher {
 
         save_parameters_to_configuration_system(publishing_parameters);
 
-        if (publishing_parameters.is_to_new_album()) {
-            do_create_album();
-        } else {
-            do_upload();
-        }
-    }
-
-    private void on_album_creation_complete(Publishing.RESTSupport.Transaction txn) {
-        txn.completed.disconnect(on_album_creation_complete);
-        txn.network_error.disconnect(on_album_creation_error);
-        
-        if (!is_running())
-            return;
-            
-        debug("EVENT: finished creating album on remote server.");
-
-        AlbumCreationTransaction downcast_txn = (AlbumCreationTransaction) txn;
-        Publishing.RESTSupport.XmlDocument response_doc;
-        try {
-            response_doc = Publishing.RESTSupport.XmlDocument.parse_string(
-                downcast_txn.get_response(), AlbumDirectoryTransaction.validate_xml);
-        } catch (Spit.Publishing.PublishingError err) {
-            get_host().post_error(err);
-            return;
-        }
-
-        Album[] response_albums;
-        try {
-            response_albums = extract_albums_helper(response_doc.get_root_node());
-        } catch (Spit.Publishing.PublishingError err) {
-            get_host().post_error(err);
-            return;
-        }
-
-        if (response_albums.length != 1) {
-            get_host().post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE("album " +
-                "creation transaction responses must contain one and only one album directory " +
-                "entry"));
-            return;
-        }
-
-        publishing_parameters.set_target_album_entry_url(response_albums[0].url);
-
         do_upload();
     }
 
-    private void on_album_creation_error(Publishing.RESTSupport.Transaction bad_txn,
-        Spit.Publishing.PublishingError err) {
-        bad_txn.completed.disconnect(on_album_creation_complete);
-        bad_txn.network_error.disconnect(on_album_creation_error);
-        
-        if (!is_running())
-            return;
-            
-        debug("EVENT: creating album on remote server failed; response = '%s'.",
-            bad_txn.get_response());
-
-        get_host().post_error(err);
-    }
-
     private void on_upload_status_updated(int file_number, double completed_fraction) {
         if (!is_running())
             return;
@@ -296,12 +235,6 @@ public class PicasaPublisher : Publishing.RESTSupport.GooglePublisher {
         get_host().post_error(err);
     }
 
-    private void do_show_service_welcome_pane() {
-        debug("ACTION: showing service welcome pane.");
-
-        get_host().install_welcome_pane(SERVICE_WELCOME_MESSAGE, on_service_welcome_login);
-    }
-
     private void do_fetch_account_information() {
         debug("ACTION: fetching account and album information.");
 
@@ -350,10 +283,7 @@ public class PicasaPublisher : Publishing.RESTSupport.GooglePublisher {
         Gtk.Builder builder = new Gtk.Builder();
 
         try {
-            // the trailing get_path() is required, since add_from_file can't cope
-            // with File objects directly and expects a pathname instead.
-            builder.add_from_resource(Resources.RESOURCE_PATH + "/" +
-                "picasa_publishing_options_pane.ui");
+            builder.add_from_resource(Resources.RESOURCE_PATH + "/" + "picasa_publishing_options_pane.ui");
         } catch (Error e) {
             warning("Could not parse UI file! Error: %s.", e.message);
             get_host().post_error(
@@ -362,7 +292,7 @@ public class PicasaPublisher : Publishing.RESTSupport.GooglePublisher {
             return;
         }
 
-        PublishingOptionsPane opts_pane = new PublishingOptionsPane(builder, publishing_parameters);
+        var opts_pane = new PublishingOptionsPane(builder, publishing_parameters, this.authenticator.can_logout());
         opts_pane.publish.connect(on_publishing_options_publish);
         opts_pane.logout.connect(on_publishing_options_logout);
         get_host().install_dialog_pane(opts_pane);
@@ -370,27 +300,6 @@ public class PicasaPublisher : Publishing.RESTSupport.GooglePublisher {
         get_host().set_service_locked(false);
     }
 
-    private void do_create_album() {
-        assert(publishing_parameters.is_to_new_album());
-
-        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().set_service_locked(true);
-
-        AlbumCreationTransaction creation_trans = new AlbumCreationTransaction(get_session(),
-            publishing_parameters);
-        creation_trans.network_error.connect(on_album_creation_error);
-        creation_trans.completed.connect(on_album_creation_complete);
-        try {
-            creation_trans.execute();
-        } catch (Spit.Publishing.PublishingError err) {
-            get_host().post_error(err);
-        }
-    }
-
     private void do_upload() {       
         debug("ACTION: uploading media items to remote server.");
 
@@ -425,13 +334,12 @@ public class PicasaPublisher : Publishing.RESTSupport.GooglePublisher {
 
     protected override void do_logout() {
         debug("ACTION: logging out user.");
-        
         get_session().deauthenticate();
-        refresh_token = null;
-        get_host().unset_config_key("refresh_token");
-          
 
-        do_show_service_welcome_pane();
+        if (this.authenticator.can_logout()) {
+            this.authenticator.logout();
+            this.authenticator.authenticate();
+        }
     }
 
     public override bool is_running() {
@@ -446,10 +354,7 @@ public class PicasaPublisher : Publishing.RESTSupport.GooglePublisher {
 
         running = true;
 
-        if (refresh_token == null)
-            do_show_service_welcome_pane();
-        else
-            start_oauth_flow(refresh_token);
+        this.authenticator.authenticate();
     }
 
     public override void stop() {
@@ -459,6 +364,14 @@ public class PicasaPublisher : Publishing.RESTSupport.GooglePublisher {
 
         running = false;
     }
+
+    protected override Spit.Publishing.Authenticator get_authenticator() {
+        if (this.authenticator == null) {
+            this.authenticator = Publishing.Authenticator.Factory.get_instance().create("picasa", get_host());
+        }
+
+        return this.authenticator;
+    }
 }
 
 internal class Album {
@@ -489,24 +402,6 @@ internal class AlbumDirectoryTransaction :
     }
 }
 
-private class AlbumCreationTransaction :
-    Publishing.RESTSupport.GooglePublisher.AuthenticatedTransaction {
-    private const string ENDPOINT_URL = "https://picasaweb.google.com/data/feed/api/user/" +
-        "default";
-    private const string ALBUM_ENTRY_TEMPLATE = "<?xml version='1.0' encoding='utf-8'?><entry xmlns='http://www.w3.org/2005/Atom' xmlns:gphoto='http://schemas.google.com/photos/2007'><title type='text'>%s</title><gphoto:access>%s</gphoto:access><category scheme='http://schemas.google.com/g/2005#kind' term='http://schemas.google.com/photos/2007#album'></category></entry>";
-    
-    public AlbumCreationTransaction(Publishing.RESTSupport.GoogleSession session,
-        PublishingParameters parameters) {
-        base(session, ENDPOINT_URL, Publishing.RESTSupport.HttpMethod.POST);
-
-        string post_body = ALBUM_ENTRY_TEMPLATE.printf(Publishing.RESTSupport.decimal_entity_encode(
-            parameters.get_target_album_name()), parameters.is_new_album_public() ?
-            "public" : "private");
-
-        set_custom_payload(post_body, "application/atom+xml");
-    }
-}
-
 internal class UploadTransaction :
     Publishing.RESTSupport.GooglePublisher.AuthenticatedTransaction {
     private PublishingParameters parameters;
@@ -524,8 +419,16 @@ internal class UploadTransaction :
         this.session = session;
         this.parameters = parameters;
         this.publishable = publishable;
-        this.mime_type = (publishable.get_media_type() == Spit.Publishing.Publisher.MediaType.VIDEO) ?
-            "video/mpeg" : "image/jpeg";
+        if (publishable.get_media_type() == Spit.Publishing.Publisher.MediaType.VIDEO) {
+            try {
+                var info = this.publishable.get_serialized_file().query_info(FileAttribute.STANDARD_CONTENT_TYPE, FileQueryInfoFlags.NONE);
+                this.mime_type = ContentType.get_mime_type(info.get_content_type());
+            } catch (Error err) {
+                this.mime_type = "video/mpeg";
+            }
+        } else {
+            this.mime_type = "image/jpeg";
+        }
     }
 
     public override void execute() throws Spit.Publishing.PublishingError {
@@ -617,10 +520,7 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
     private Gtk.Box pane_widget = null;
     private Gtk.Label login_identity_label = null;
     private Gtk.Label publish_to_label = null;
-    private Gtk.RadioButton use_existing_radio = null;
     private Gtk.ComboBoxText existing_albums_combo = null;
-    private Gtk.RadioButton create_new_radio = null;
-    private Gtk.Entry new_album_entry = null;
     private Gtk.CheckButton public_check = null;
     private Gtk.ComboBoxText size_combo = null;
     private Gtk.CheckButton strip_metadata_check = null;
@@ -632,7 +532,7 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
     public signal void publish();
     public signal void logout();
 
-    public PublishingOptionsPane(Gtk.Builder builder, PublishingParameters parameters) {
+    public PublishingOptionsPane(Gtk.Builder builder, PublishingParameters parameters, bool can_logout) {
         size_descriptions = create_size_descriptions();
 
         this.builder = builder;
@@ -645,16 +545,17 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
         pane_widget = (Gtk.Box) builder.get_object("picasa_pane_widget");
         login_identity_label = (Gtk.Label) builder.get_object("login_identity_label");
         publish_to_label = (Gtk.Label) builder.get_object("publish_to_label");
-        use_existing_radio = (Gtk.RadioButton) builder.get_object("use_existing_radio");
         existing_albums_combo = (Gtk.ComboBoxText) builder.get_object("existing_albums_combo");
-        create_new_radio = (Gtk.RadioButton) builder.get_object("create_new_radio");
-        new_album_entry = (Gtk.Entry) builder.get_object("new_album_entry");
         public_check = (Gtk.CheckButton) builder.get_object("public_check");
         size_combo = (Gtk.ComboBoxText) builder.get_object("size_combo");
         strip_metadata_check = (Gtk.CheckButton) this.builder.get_object("strip_metadata_check");
         publish_button = (Gtk.Button) builder.get_object("publish_button");
         logout_button = (Gtk.Button) builder.get_object("logout_button");
 
+        if (!can_logout) {
+            logout_button.parent.remove(logout_button);
+        }
+
         // populate any widgets whose contents are programmatically-generated.
         login_identity_label.set_label(_("You are logged into Picasa Web Albums as %s.").printf(
             parameters.get_user_name()));
@@ -677,9 +578,6 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
         }
 
         // connect all signals.
-        use_existing_radio.clicked.connect(on_use_existing_radio_clicked);
-        create_new_radio.clicked.connect(on_create_new_radio_clicked);
-        new_album_entry.changed.connect(on_new_album_entry_changed);
         logout_button.clicked.connect(on_logout_clicked);
         publish_button.clicked.connect(on_publish_clicked);
     }
@@ -697,49 +595,15 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
         
         Album[] albums = parameters.get_albums();
 
-        if (create_new_radio.get_active()) {
-            parameters.set_target_album_name(new_album_entry.get_text());
-            parameters.set_is_to_new_album(true);
-            parameters.set_is_new_album_public(public_check.get_active());
-            publish();
-        } else {
-            parameters.set_target_album_name(albums[existing_albums_combo.get_active()].name);
-            parameters.set_is_to_new_album(false);
-            parameters.set_target_album_entry_url(albums[existing_albums_combo.get_active()].url);
-            publish();
-        }
-    }
-
-    private void on_use_existing_radio_clicked() {
-        existing_albums_combo.set_sensitive(true);
-        new_album_entry.set_sensitive(false);
-        existing_albums_combo.grab_focus();
-        update_publish_button_sensitivity();
-        public_check.set_sensitive(false);
-    }
-
-    private void on_create_new_radio_clicked() {
-        new_album_entry.set_sensitive(true);
-        existing_albums_combo.set_sensitive(false);
-        new_album_entry.grab_focus();
-        update_publish_button_sensitivity();
-        public_check.set_sensitive(true);
+        parameters.set_target_album_name(albums[existing_albums_combo.get_active()].name);
+        parameters.set_target_album_entry_url(albums[existing_albums_combo.get_active()].url);
+        publish();
     }
 
     private void on_logout_clicked() {
         logout();
     }
 
-    private void update_publish_button_sensitivity() {
-        string album_name = new_album_entry.get_text();
-        publish_button.set_sensitive(!(album_name.strip() == "" &&
-            create_new_radio.get_active()));
-    }
-
-    private void on_new_album_entry_changed() {
-        update_publish_button_sensitivity();
-    }
-
     private SizeDescription[] create_size_descriptions() {
         SizeDescription[] result = new SizeDescription[0];
 
@@ -760,32 +624,16 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
         
         for (int i = 0; i < albums.length; i++) {
             existing_albums_combo.append_text(albums[i].name);
+            // Activate last known album id. If none was chosen, either use the old default (Shotwell connect)
+            // or the new "Default album" album for Google Photos
             if (albums[i].name == last_album ||
-                (albums[i].name == DEFAULT_ALBUM_NAME && default_album_id == -1))
+                ((albums[i].name == DEFAULT_ALBUM_NAME || albums[i].name == _("Default album")) && default_album_id == -1))
                 default_album_id = i;
         }
 
-        if (albums.length == 0) {
-            existing_albums_combo.set_sensitive(false);
-            use_existing_radio.set_sensitive(false);
-            create_new_radio.set_active(true);
-            new_album_entry.grab_focus();
-            new_album_entry.set_text(DEFAULT_ALBUM_NAME);
-        } else {
-            if (default_album_id >= 0) {
-                use_existing_radio.set_active(true);
-                existing_albums_combo.set_active(default_album_id);
-                new_album_entry.set_sensitive(false);
-                public_check.set_sensitive(false);
-            } else {
-                create_new_radio.set_active(true);
-                existing_albums_combo.set_active(0);
-                new_album_entry.set_text(DEFAULT_ALBUM_NAME);
-                new_album_entry.grab_focus();
-                public_check.set_sensitive(true);
-            }
+        if (default_album_id >= 0) {
+            existing_albums_combo.set_active(default_album_id);
         }
-        update_publish_button_sensitivity();
     }
 
     public Gtk.Widget get_widget() {
@@ -816,7 +664,6 @@ internal class PublishingParameters {
     private string user_name;
     private Album[] albums;
     private Spit.Publishing.Publisher.MediaType media_type;
-    private bool to_new_album;
 
     public PublishingParameters() {
         this.user_name = "[unknown]";
@@ -828,23 +675,6 @@ internal class PublishingParameters {
         this.albums = null;
         this.strip_metadata = false;
         this.media_type = Spit.Publishing.Publisher.MediaType.PHOTO;
-        this.to_new_album = true;
-    }
-    
-    public bool is_to_new_album() {
-        return to_new_album;
-    }
-    
-    public void set_is_to_new_album(bool to_new_album) {
-        this.to_new_album = to_new_album;
-    }
-    
-    public void set_is_new_album_public(bool album_public) {
-        this.album_public = album_public;
-    }
-    
-    public bool is_new_album_public() {
-        return album_public;
     }
     
     public string get_target_album_name() {
diff --git a/plugins/shotwell-publishing/PiwigoPublishing.c b/plugins/shotwell-publishing/PiwigoPublishing.c
index 820936f..8d6eaa6 100644
--- a/plugins/shotwell-publishing/PiwigoPublishing.c
+++ b/plugins/shotwell-publishing/PiwigoPublishing.c
@@ -698,8 +698,8 @@ static void publishing_piwigo_piwigo_publisher_do_show_ssl_downgrade_pane (Publi
 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);
+static void __lambda7_ (PublishingPiwigoPiwigoPublisher* self);
+static void ___lambda7__publishing_piwigo_ssl_error_pane_proceed (PublishingPiwigoSSLErrorPane* _sender, gpointer 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);
@@ -737,7 +737,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_error (Publishi
 static void _publishing_piwigo_piwigo_publisher_on_category_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
 static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* txn);
 static void _publishing_piwigo_piwigo_publisher_on_category_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void _vala_array_add34 (PublishingPiwigoCategory*** array, int* length, int* size, PublishingPiwigoCategory* value);
+static void _vala_array_add35 (PublishingPiwigoCategory*** array, int* length, int* size, PublishingPiwigoCategory* value);
 static void publishing_piwigo_piwigo_publisher_do_show_publishing_options_pane (PublishingPiwigoPiwigoPublisher* self);
 GType publishing_piwigo_publishing_options_pane_get_type (void) G_GNUC_CONST;
 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);
@@ -798,11 +798,11 @@ enum  {
 static void publishing_piwigo_ssl_error_pane_real_constructed (GObject* base);
 gchar* publishing_piwigo_ssl_error_pane_get_host (PublishingPiwigoSSLErrorPane* self);
 gchar* publishing_piwigo_ssl_error_pane_get_error_text (PublishingPiwigoSSLErrorPane* self);
-static void __lambda4_ (PublishingPiwigoSSLErrorPane* self);
-static GTlsCertificate* publishing_piwigo_ssl_error_pane_get_cert (PublishingPiwigoSSLErrorPane* self);
-static void ___lambda4__gtk_button_clicked (GtkButton* _sender, gpointer self);
 static void __lambda5_ (PublishingPiwigoSSLErrorPane* self);
+static GTlsCertificate* publishing_piwigo_ssl_error_pane_get_cert (PublishingPiwigoSSLErrorPane* self);
 static void ___lambda5__gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void __lambda6_ (PublishingPiwigoSSLErrorPane* self);
+static void ___lambda6__gtk_button_clicked (GtkButton* _sender, gpointer self);
 static void publishing_piwigo_ssl_error_pane_set_host (PublishingPiwigoSSLErrorPane* self, const gchar* value);
 static void publishing_piwigo_ssl_error_pane_set_cert (PublishingPiwigoSSLErrorPane* self, GTlsCertificate* value);
 static void publishing_piwigo_ssl_error_pane_set_error_text (PublishingPiwigoSSLErrorPane* self, const gchar* value);
@@ -868,16 +868,16 @@ static void _publishing_piwigo_publishing_options_pane_on_existing_combo_changed
 static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pane_create_perm_levels (PublishingPiwigoPublishingOptionsPane* self, int* result_length1);
 static PublishingPiwigoSizeEntry** publishing_piwigo_publishing_options_pane_create_sizes (PublishingPiwigoPublishingOptionsPane* self, int* result_length1);
 static const gchar* publishing_piwigo_publishing_options_pane_get_default_comment (PublishingPiwigoPublishingOptionsPane* self);
-static void _vala_array_add35 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value);
 static void _vala_array_add36 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value);
 static void _vala_array_add37 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value);
 static void _vala_array_add38 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value);
 static void _vala_array_add39 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value);
-static void _vala_array_add40 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value);
+static void _vala_array_add40 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value);
 static void _vala_array_add41 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value);
 static void _vala_array_add42 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value);
 static void _vala_array_add43 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value);
 static void _vala_array_add44 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value);
+static void _vala_array_add45 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value);
 static GeeList* publishing_piwigo_publishing_options_pane_get_existing_categories (PublishingPiwigoPublishingOptionsPane* self);
 static void publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (PublishingPiwigoPublishingOptionsPane* self);
 static gboolean publishing_piwigo_publishing_options_pane_category_already_exists (PublishingPiwigoPublishingOptionsPane* self, const gchar* category_name);
@@ -3124,7 +3124,7 @@ static void publishing_piwigo_piwigo_publisher_do_show_authentication_pane (Publ
 }
 
 
-static void __lambda6_ (PublishingPiwigoPiwigoPublisher* self) {
+static void __lambda7_ (PublishingPiwigoPiwigoPublisher* self) {
 	PublishingPiwigoSession* _tmp0_ = NULL;
 	PublishingPiwigoSession* _tmp1_ = NULL;
 	gchar* persistent_url = NULL;
@@ -3224,9 +3224,9 @@ static void __lambda6_ (PublishingPiwigoPiwigoPublisher* self) {
 }
 
 
-static void ___lambda6__publishing_piwigo_ssl_error_pane_proceed (PublishingPiwigoSSLErrorPane* _sender, gpointer self) {
+static void ___lambda7__publishing_piwigo_ssl_error_pane_proceed (PublishingPiwigoSSLErrorPane* _sender, gpointer self) {
 #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	__lambda6_ ((PublishingPiwigoPiwigoPublisher*) self);
+	__lambda7_ ((PublishingPiwigoPiwigoPublisher*) self);
 #line 3229 "PiwigoPublishing.c"
 }
 
@@ -3276,7 +3276,7 @@ static void publishing_piwigo_piwigo_publisher_do_show_ssl_downgrade_pane (Publi
 #line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	ssl_pane = _tmp5_;
 #line 296 "/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);
+	g_signal_connect_object (ssl_pane, "proceed", (GCallback) ___lambda7__publishing_piwigo_ssl_error_pane_proceed, self, 0);
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = self->priv->host;
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3459,7 +3459,7 @@ static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwig
 #line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 3460 "PiwigoPublishing.c"
-				goto __catch32_spit_publishing_publishing_error;
+				goto __catch23_spit_publishing_publishing_error;
 			}
 #line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (login_trans);
@@ -3472,8 +3472,8 @@ static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwig
 #line 3471 "PiwigoPublishing.c"
 		}
 	}
-	goto __finally32;
-	__catch32_spit_publishing_publishing_error:
+	goto __finally23;
+	__catch23_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		GError* _tmp13_ = NULL;
@@ -3508,7 +3508,7 @@ static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwig
 		_g_error_free0 (err);
 #line 3508 "PiwigoPublishing.c"
 	}
-	__finally32:
+	__finally23:
 #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3722,7 +3722,7 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
 #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 3723 "PiwigoPublishing.c"
-				goto __catch33_spit_publishing_publishing_error;
+				goto __catch24_spit_publishing_publishing_error;
 			}
 #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);
@@ -3733,8 +3733,8 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
 #line 3732 "PiwigoPublishing.c"
 		}
 	}
-	goto __finally33;
-	__catch33_spit_publishing_publishing_error:
+	goto __finally24;
+	__catch24_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 #line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3767,7 +3767,7 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
 #line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 3768 "PiwigoPublishing.c"
-					goto __catch34_spit_publishing_publishing_error;
+					goto __catch25_spit_publishing_publishing_error;
 				}
 #line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_error_free0 (err);
@@ -3780,8 +3780,8 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
 #line 3779 "PiwigoPublishing.c"
 			}
 		}
-		goto __finally34;
-		__catch34_spit_publishing_publishing_error:
+		goto __finally25;
+		__catch25_spit_publishing_publishing_error:
 		{
 			GError* code = NULL;
 			gint code_int = 0;
@@ -3824,7 +3824,7 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
 			_g_error_free0 (code);
 #line 3824 "PiwigoPublishing.c"
 		}
-		__finally34:
+		__finally25:
 #line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3845,7 +3845,7 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
 		return;
 #line 3845 "PiwigoPublishing.c"
 	}
-	__finally33:
+	__finally24:
 #line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4038,7 +4038,7 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 #line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 4039 "PiwigoPublishing.c"
-					goto __catch35_spit_publishing_publishing_error;
+					goto __catch26_spit_publishing_publishing_error;
 				}
 #line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_publishing_rest_support_transaction_unref0 (status_txn);
@@ -4051,8 +4051,8 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 #line 4050 "PiwigoPublishing.c"
 			}
 		}
-		goto __finally35;
-		__catch35_spit_publishing_publishing_error:
+		goto __finally26;
+		__catch26_spit_publishing_publishing_error:
 		{
 			GError* err = NULL;
 			GError* _tmp11_ = NULL;
@@ -4071,7 +4071,7 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 			_g_error_free0 (err);
 #line 4070 "PiwigoPublishing.c"
 		}
-		__finally35:
+		__finally26:
 #line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4119,7 +4119,7 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 4119 "PiwigoPublishing.c"
-					goto __catch36_spit_publishing_publishing_error;
+					goto __catch27_spit_publishing_publishing_error;
 				}
 #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_publishing_rest_support_transaction_unref0 (status_txn);
@@ -4132,8 +4132,8 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 #line 4130 "PiwigoPublishing.c"
 			}
 		}
-		goto __finally36;
-		__catch36_spit_publishing_publishing_error:
+		goto __finally27;
+		__catch27_spit_publishing_publishing_error:
 		{
 			GError* err = NULL;
 			GError* _tmp17_ = NULL;
@@ -4152,7 +4152,7 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 			_g_error_free0 (err);
 #line 4150 "PiwigoPublishing.c"
 		}
-		__finally36:
+		__finally27:
 #line 497 "/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"
@@ -4266,7 +4266,7 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 #line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 4265 "PiwigoPublishing.c"
-					goto __catch37_spit_publishing_publishing_error;
+					goto __catch28_spit_publishing_publishing_error;
 				}
 #line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_free0 (pwg_id);
@@ -4319,7 +4319,7 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 #line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 4318 "PiwigoPublishing.c"
-						goto __catch38_spit_publishing_publishing_error;
+						goto __catch29_spit_publishing_publishing_error;
 					}
 #line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_publishing_rest_support_xml_document_unref0 (doc);
@@ -4383,8 +4383,8 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 				_g_free0 (username);
 #line 4381 "PiwigoPublishing.c"
 			}
-			goto __finally38;
-			__catch38_spit_publishing_publishing_error:
+			goto __finally29;
+			__catch29_spit_publishing_publishing_error:
 			{
 				GError* err2 = NULL;
 				GError* _tmp35_ = NULL;
@@ -4411,7 +4411,7 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 				return;
 #line 4408 "PiwigoPublishing.c"
 			}
-			__finally38:
+			__finally29:
 #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4419,7 +4419,7 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 4417 "PiwigoPublishing.c"
-					goto __catch37_spit_publishing_publishing_error;
+					goto __catch28_spit_publishing_publishing_error;
 				}
 #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_publishing_rest_support_xml_document_unref0 (doc);
@@ -4439,8 +4439,8 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 			_publishing_rest_support_xml_document_unref0 (doc);
 #line 4436 "PiwigoPublishing.c"
 		}
-		goto __finally37;
-		__catch37_spit_publishing_publishing_error:
+		goto __finally28;
+		__catch28_spit_publishing_publishing_error:
 		{
 			GError* err = NULL;
 			GError* _tmp36_ = NULL;
@@ -4465,7 +4465,7 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 			return;
 #line 4461 "PiwigoPublishing.c"
 		}
-		__finally37:
+		__finally28:
 #line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4589,7 +4589,7 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi
 #line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 4586 "PiwigoPublishing.c"
-				goto __catch39_spit_publishing_publishing_error;
+				goto __catch30_spit_publishing_publishing_error;
 			}
 #line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (cat_trans);
@@ -4602,8 +4602,8 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi
 #line 4597 "PiwigoPublishing.c"
 		}
 	}
-	goto __finally39;
-	__catch39_spit_publishing_publishing_error:
+	goto __finally30;
+	__catch30_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
@@ -4621,7 +4621,7 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi
 		_g_error_free0 (err);
 #line 4617 "PiwigoPublishing.c"
 	}
-	__finally39:
+	__finally30:
 #line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4647,7 +4647,7 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi
      * populates the categories list. It then triggers the display of the
      * publishing options pane.
      */
-static void _vala_array_add34 (PublishingPiwigoCategory*** array, int* length, int* size, PublishingPiwigoCategory* value) {
+static void _vala_array_add35 (PublishingPiwigoCategory*** array, int* length, int* size, PublishingPiwigoCategory* value) {
 #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
 #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4764,7 +4764,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 4761 "PiwigoPublishing.c"
-				goto __catch40_spit_publishing_publishing_error;
+				goto __catch31_spit_publishing_publishing_error;
 			}
 #line 609 "/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);
@@ -4889,7 +4889,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 #line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 4886 "PiwigoPublishing.c"
-						goto __catch40_spit_publishing_publishing_error;
+						goto __catch31_spit_publishing_publishing_error;
 					}
 #line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_object_unref0 (id_map);
@@ -4942,7 +4942,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 4939 "PiwigoPublishing.c"
-						goto __catch40_spit_publishing_publishing_error;
+						goto __catch31_spit_publishing_publishing_error;
 					}
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_object_unref0 (id_map);
@@ -5023,7 +5023,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp51_ = publishing_piwigo_category_new (_tmp48_, _tmp49_, _tmp50_, "");
 #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_vala_array_add34 (&self->priv->categories, &self->priv->categories_length1, &self->priv->_categories_size_, _tmp51_);
+				_vala_array_add35 (&self->priv->categories, &self->priv->categories_length1, &self->priv->_categories_size_, _tmp51_);
 #line 5022 "PiwigoPublishing.c"
 			}
 		}
@@ -5227,8 +5227,8 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 		_publishing_rest_support_xml_document_unref0 (doc);
 #line 5223 "PiwigoPublishing.c"
 	}
-	goto __finally40;
-	__catch40_spit_publishing_publishing_error:
+	goto __finally31;
+	__catch31_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		GError* _tmp82_ = NULL;
@@ -5248,7 +5248,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 		return;
 #line 5244 "PiwigoPublishing.c"
 	}
-	__finally40:
+	__finally31:
 #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5437,7 +5437,7 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout
 #line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 5433 "PiwigoPublishing.c"
-				goto __catch41_spit_publishing_publishing_error;
+				goto __catch32_spit_publishing_publishing_error;
 			}
 #line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (logout_trans);
@@ -5450,8 +5450,8 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout
 #line 5444 "PiwigoPublishing.c"
 		}
 	}
-	goto __finally41;
-	__catch41_spit_publishing_publishing_error:
+	goto __finally32;
+	__catch32_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		GError* _tmp2_ = NULL;
@@ -5470,7 +5470,7 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout
 		_g_error_free0 (err);
 #line 5464 "PiwigoPublishing.c"
 	}
-	__finally41:
+	__finally32:
 #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5798,7 +5798,7 @@ static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiw
 #line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 5792 "PiwigoPublishing.c"
-				goto __catch42_spit_publishing_publishing_error;
+				goto __catch33_spit_publishing_publishing_error;
 			}
 #line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (creation_trans);
@@ -5811,8 +5811,8 @@ static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiw
 #line 5803 "PiwigoPublishing.c"
 		}
 	}
-	goto __finally42;
-	__catch42_spit_publishing_publishing_error:
+	goto __finally33;
+	__catch33_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		GError* _tmp25_ = NULL;
@@ -5830,7 +5830,7 @@ static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiw
 		_g_error_free0 (err);
 #line 5823 "PiwigoPublishing.c"
 	}
-	__finally42:
+	__finally33:
 #line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5925,7 +5925,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish
 #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 5919 "PiwigoPublishing.c"
-				goto __catch43_spit_publishing_publishing_error;
+				goto __catch34_spit_publishing_publishing_error;
 			}
 #line 802 "/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);
@@ -5956,7 +5956,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 5950 "PiwigoPublishing.c"
-				goto __catch43_spit_publishing_publishing_error;
+				goto __catch34_spit_publishing_publishing_error;
 			}
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (doc);
@@ -6000,8 +6000,8 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish
 		_publishing_rest_support_xml_document_unref0 (doc);
 #line 5993 "PiwigoPublishing.c"
 	}
-	goto __finally43;
-	__catch43_spit_publishing_publishing_error:
+	goto __finally34;
+	__catch34_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		GError* _tmp23_ = NULL;
@@ -6019,7 +6019,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish
 		_g_error_free0 (err);
 #line 6012 "PiwigoPublishing.c"
 	}
-	__finally43:
+	__finally34:
 #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6974,7 +6974,7 @@ PublishingPiwigoSSLErrorPane* publishing_piwigo_ssl_error_pane_new (PublishingPi
 }
 
 
-static void __lambda4_ (PublishingPiwigoSSLErrorPane* self) {
+static void __lambda5_ (PublishingPiwigoSSLErrorPane* self) {
 	GcrSimpleCertificate* simple_cert = NULL;
 	GTlsCertificate* _tmp0_ = NULL;
 	GByteArray* _tmp1_ = NULL;
@@ -7106,23 +7106,23 @@ static void __lambda4_ (PublishingPiwigoSSLErrorPane* self) {
 }
 
 
-static void ___lambda4__gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void ___lambda5__gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	__lambda4_ ((PublishingPiwigoSSLErrorPane*) self);
+	__lambda5_ ((PublishingPiwigoSSLErrorPane*) self);
 #line 7103 "PiwigoPublishing.c"
 }
 
 
-static void __lambda5_ (PublishingPiwigoSSLErrorPane* self) {
+static void __lambda6_ (PublishingPiwigoSSLErrorPane* self) {
 #line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_emit_by_name (self, "proceed");
 #line 7110 "PiwigoPublishing.c"
 }
 
 
-static void ___lambda5__gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void ___lambda6__gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	__lambda5_ ((PublishingPiwigoSSLErrorPane*) self);
+	__lambda6_ ((PublishingPiwigoSSLErrorPane*) self);
 #line 7117 "PiwigoPublishing.c"
 }
 
@@ -7248,7 +7248,7 @@ static void publishing_piwigo_ssl_error_pane_real_constructed (GObject* base) {
 #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	info = _tmp25_;
 #line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_connect_object (info, "clicked", (GCallback) ___lambda4__gtk_button_clicked, self, 0);
+	g_signal_connect_object (info, "clicked", (GCallback) ___lambda5__gtk_button_clicked, self, 0);
 #line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp26_ = shotwell_plugins_common_builder_pane_get_builder (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
 #line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -7264,7 +7264,7 @@ static void publishing_piwigo_ssl_error_pane_real_constructed (GObject* base) {
 #line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	proceed = _tmp30_;
 #line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_connect_object (proceed, "clicked", (GCallback) ___lambda5__gtk_button_clicked, self, 0);
+	g_signal_connect_object (proceed, "clicked", (GCallback) ___lambda6__gtk_button_clicked, self, 0);
 #line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (proceed);
 #line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8690,7 +8690,7 @@ static void publishing_piwigo_publishing_options_pane_real_constructed (GObject*
 }
 
 
-static void _vala_array_add35 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
+static void _vala_array_add36 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
 #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
 #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8707,7 +8707,7 @@ static void _vala_array_add35 (PublishingPiwigoPermissionLevel*** array, int* le
 }
 
 
-static void _vala_array_add36 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
+static void _vala_array_add37 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
 #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
 #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8724,7 +8724,7 @@ static void _vala_array_add36 (PublishingPiwigoPermissionLevel*** array, int* le
 }
 
 
-static void _vala_array_add37 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
+static void _vala_array_add38 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
 #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
 #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8741,7 +8741,7 @@ static void _vala_array_add37 (PublishingPiwigoPermissionLevel*** array, int* le
 }
 
 
-static void _vala_array_add38 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
+static void _vala_array_add39 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
 #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
 #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8758,7 +8758,7 @@ static void _vala_array_add38 (PublishingPiwigoPermissionLevel*** array, int* le
 }
 
 
-static void _vala_array_add39 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
+static void _vala_array_add40 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
 #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
 #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8822,7 +8822,7 @@ static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pa
 #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = publishing_piwigo_permission_level_new (0, _tmp2_);
 #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add35 (&_result_, &_result__length1, &__result__size_, _tmp3_);
+	_vala_array_add36 (&_result_, &_result__length1, &__result__size_, _tmp3_);
 #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = _result_;
 #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8832,7 +8832,7 @@ static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pa
 #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = publishing_piwigo_permission_level_new (1, _tmp5_);
 #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add36 (&_result_, &_result__length1, &__result__size_, _tmp6_);
+	_vala_array_add37 (&_result_, &_result__length1, &__result__size_, _tmp6_);
 #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = _result_;
 #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8842,7 +8842,7 @@ static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pa
 #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp9_ = publishing_piwigo_permission_level_new (2, _tmp8_);
 #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add37 (&_result_, &_result__length1, &__result__size_, _tmp9_);
+	_vala_array_add38 (&_result_, &_result__length1, &__result__size_, _tmp9_);
 #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp10_ = _result_;
 #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8852,7 +8852,7 @@ static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pa
 #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp12_ = publishing_piwigo_permission_level_new (4, _tmp11_);
 #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add38 (&_result_, &_result__length1, &__result__size_, _tmp12_);
+	_vala_array_add39 (&_result_, &_result__length1, &__result__size_, _tmp12_);
 #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp13_ = _result_;
 #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8862,7 +8862,7 @@ static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pa
 #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp15_ = publishing_piwigo_permission_level_new (8, _tmp14_);
 #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add39 (&_result_, &_result__length1, &__result__size_, _tmp15_);
+	_vala_array_add40 (&_result_, &_result__length1, &__result__size_, _tmp15_);
 #line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp16_ = _result_;
 #line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8881,7 +8881,7 @@ static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pa
 }
 
 
-static void _vala_array_add40 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
+static void _vala_array_add41 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
 #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
 #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8898,7 +8898,7 @@ static void _vala_array_add40 (PublishingPiwigoSizeEntry*** array, int* length,
 }
 
 
-static void _vala_array_add41 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
+static void _vala_array_add42 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8915,7 +8915,7 @@ static void _vala_array_add41 (PublishingPiwigoSizeEntry*** array, int* length,
 }
 
 
-static void _vala_array_add42 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
+static void _vala_array_add43 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
 #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
 #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8932,7 +8932,7 @@ static void _vala_array_add42 (PublishingPiwigoSizeEntry*** array, int* length,
 }
 
 
-static void _vala_array_add43 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
+static void _vala_array_add44 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
 #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
 #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8949,7 +8949,7 @@ static void _vala_array_add43 (PublishingPiwigoSizeEntry*** array, int* length,
 }
 
 
-static void _vala_array_add44 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
+static void _vala_array_add45 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
 #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
 #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9013,7 +9013,7 @@ static PublishingPiwigoSizeEntry** publishing_piwigo_publishing_options_pane_cre
 #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = publishing_piwigo_size_entry_new (500, _tmp2_);
 #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add40 (&_result_, &_result__length1, &__result__size_, _tmp3_);
+	_vala_array_add41 (&_result_, &_result__length1, &__result__size_, _tmp3_);
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = _result_;
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9023,7 +9023,7 @@ static PublishingPiwigoSizeEntry** publishing_piwigo_publishing_options_pane_cre
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = publishing_piwigo_size_entry_new (1024, _tmp5_);
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add41 (&_result_, &_result__length1, &__result__size_, _tmp6_);
+	_vala_array_add42 (&_result_, &_result__length1, &__result__size_, _tmp6_);
 #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = _result_;
 #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9033,7 +9033,7 @@ static PublishingPiwigoSizeEntry** publishing_piwigo_publishing_options_pane_cre
 #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp9_ = publishing_piwigo_size_entry_new (2048, _tmp8_);
 #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add42 (&_result_, &_result__length1, &__result__size_, _tmp9_);
+	_vala_array_add43 (&_result_, &_result__length1, &__result__size_, _tmp9_);
 #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp10_ = _result_;
 #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9043,7 +9043,7 @@ static PublishingPiwigoSizeEntry** publishing_piwigo_publishing_options_pane_cre
 #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp12_ = publishing_piwigo_size_entry_new (4096, _tmp11_);
 #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add43 (&_result_, &_result__length1, &__result__size_, _tmp12_);
+	_vala_array_add44 (&_result_, &_result__length1, &__result__size_, _tmp12_);
 #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp13_ = _result_;
 #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9053,7 +9053,7 @@ static PublishingPiwigoSizeEntry** publishing_piwigo_publishing_options_pane_cre
 #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp15_ = publishing_piwigo_size_entry_new (PUBLISHING_PIWIGO_ORIGINAL_SIZE, _tmp14_);
 #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add44 (&_result_, &_result__length1, &__result__size_, _tmp15_);
+	_vala_array_add45 (&_result_, &_result__length1, &__result__size_, _tmp15_);
 #line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp16_ = _result_;
 #line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11577,7 +11577,7 @@ gchar* publishing_piwigo_transaction_validate_xml (PublishingRESTSupportXmlDocum
 #line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 11565 "PiwigoPublishing.c"
-				goto __catch44_spit_publishing_publishing_error;
+				goto __catch35_spit_publishing_publishing_error;
 			}
 #line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_free0 (status);
@@ -11593,8 +11593,8 @@ gchar* publishing_piwigo_transaction_validate_xml (PublishingRESTSupportXmlDocum
 		errcode = _tmp7_;
 #line 11580 "PiwigoPublishing.c"
 	}
-	goto __finally44;
-	__catch44_spit_publishing_publishing_error:
+	goto __finally35;
+	__catch35_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp11_ = NULL;
@@ -11614,7 +11614,7 @@ gchar* publishing_piwigo_transaction_validate_xml (PublishingRESTSupportXmlDocum
 		return result;
 #line 11601 "PiwigoPublishing.c"
 	}
-	__finally44:
+	__finally35:
 #line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11693,7 +11693,7 @@ gchar* publishing_piwigo_transaction_get_error_code (PublishingRESTSupportXmlDoc
 #line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 11681 "PiwigoPublishing.c"
-				goto __catch45_spit_publishing_publishing_error;
+				goto __catch36_spit_publishing_publishing_error;
 			}
 #line 1630 "/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);
@@ -11707,8 +11707,8 @@ gchar* publishing_piwigo_transaction_get_error_code (PublishingRESTSupportXmlDoc
 		errcode = _tmp2_;
 #line 11694 "PiwigoPublishing.c"
 	}
-	goto __finally45;
-	__catch45_spit_publishing_publishing_error:
+	goto __finally36;
+	__catch36_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp6_ = NULL;
@@ -11726,7 +11726,7 @@ gchar* publishing_piwigo_transaction_get_error_code (PublishingRESTSupportXmlDoc
 		return result;
 #line 11713 "PiwigoPublishing.c"
 	}
-	__finally45:
+	__finally36:
 #line 1629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -12704,13 +12704,23 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 	GHashFunc _tmp69_ = NULL;
 	GEqualFunc _tmp70_ = NULL;
 	GHashTable* _tmp71_ = NULL;
-	gchar* _tmp72_ = NULL;
-	SpitPublishingPublishable* _tmp73_ = NULL;
-	gchar* _tmp74_ = NULL;
-	gchar* _tmp75_ = NULL;
+	gchar* basename = NULL;
+	SpitPublishingPublishable* _tmp72_ = NULL;
+	gchar* _tmp73_ = NULL;
+	gboolean _tmp74_ = FALSE;
+	const gchar* _tmp75_ = NULL;
 	gchar* _tmp76_ = NULL;
 	gchar* _tmp77_ = NULL;
-	gchar* _tmp78_ = NULL;
+	gboolean _tmp78_ = FALSE;
+	gboolean _tmp79_ = FALSE;
+	GHashTable* _tmp86_ = NULL;
+	gchar* _tmp87_ = NULL;
+	const gchar* _tmp88_ = NULL;
+	gchar* _tmp89_ = NULL;
+	GHashTable* _tmp90_ = NULL;
+	gchar* _tmp91_ = NULL;
+	gchar* _tmp92_ = NULL;
+	GHashTable* _tmp93_ = NULL;
 #line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
 #line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -12737,7 +12747,7 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 	_tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
 #line 1719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp6_) {
-#line 12726 "PiwigoPublishing.c"
+#line 12736 "PiwigoPublishing.c"
 		PublishingPiwigoSession* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
@@ -12759,7 +12769,7 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 		_g_free0 (_tmp11_);
 #line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (_tmp9_);
-#line 12748 "PiwigoPublishing.c"
+#line 12758 "PiwigoPublishing.c"
 	}
 #line 1722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp12_ = parameters;
@@ -12789,7 +12799,7 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 	_tmp18__length1 = keywords_length1;
 #line 1726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp18_ != NULL) {
-#line 12778 "PiwigoPublishing.c"
+#line 12788 "PiwigoPublishing.c"
 		gchar** _tmp19_ = NULL;
 		gint _tmp19__length1 = 0;
 		gchar* _tmp20_ = NULL;
@@ -12803,7 +12813,7 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 		_g_free0 (tags);
 #line 1727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		tags = _tmp20_;
-#line 12792 "PiwigoPublishing.c"
+#line 12802 "PiwigoPublishing.c"
 	}
 #line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp21_ = publishable;
@@ -12852,18 +12862,18 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 	if (_tmp37_ == NULL) {
 #line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp36_ = TRUE;
-#line 12840 "PiwigoPublishing.c"
+#line 12850 "PiwigoPublishing.c"
 	} else {
 		const gchar* _tmp38_ = NULL;
 #line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp38_ = name;
 #line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp36_ = g_strcmp0 (_tmp38_, "") == 0;
-#line 12847 "PiwigoPublishing.c"
+#line 12857 "PiwigoPublishing.c"
 	}
 #line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp36_) {
-#line 12851 "PiwigoPublishing.c"
+#line 12861 "PiwigoPublishing.c"
 		SpitPublishingPublishable* _tmp39_ = NULL;
 		gchar* _tmp40_ = NULL;
 		const gchar* _tmp41_ = NULL;
@@ -12885,27 +12895,27 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 		_tmp43_ = comment;
 #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (_tmp43_ != NULL) {
-#line 12873 "PiwigoPublishing.c"
+#line 12883 "PiwigoPublishing.c"
 			const gchar* _tmp44_ = NULL;
 #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp44_ = comment;
 #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp42_ = g_strcmp0 (_tmp44_, "") != 0;
-#line 12879 "PiwigoPublishing.c"
+#line 12889 "PiwigoPublishing.c"
 		} else {
 #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp42_ = FALSE;
-#line 12883 "PiwigoPublishing.c"
+#line 12893 "PiwigoPublishing.c"
 		}
 #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (_tmp42_) {
-#line 12887 "PiwigoPublishing.c"
+#line 12897 "PiwigoPublishing.c"
 			const gchar* _tmp45_ = NULL;
 #line 1741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp45_ = comment;
 #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), "comment", _tmp45_);
-#line 12893 "PiwigoPublishing.c"
+#line 12903 "PiwigoPublishing.c"
 		}
 	} else {
 		gboolean _tmp46_ = FALSE;
@@ -12914,21 +12924,21 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 		_tmp47_ = comment;
 #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (_tmp47_ != NULL) {
-#line 12902 "PiwigoPublishing.c"
+#line 12912 "PiwigoPublishing.c"
 			const gchar* _tmp48_ = NULL;
 #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp48_ = comment;
 #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp46_ = g_strcmp0 (_tmp48_, "") != 0;
-#line 12908 "PiwigoPublishing.c"
+#line 12918 "PiwigoPublishing.c"
 		} else {
 #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp46_ = FALSE;
-#line 12912 "PiwigoPublishing.c"
+#line 12922 "PiwigoPublishing.c"
 		}
 #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (_tmp46_) {
-#line 12916 "PiwigoPublishing.c"
+#line 12926 "PiwigoPublishing.c"
 			const gchar* _tmp49_ = NULL;
 			const gchar* _tmp50_ = NULL;
 #line 1746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -12939,7 +12949,7 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 			_tmp50_ = comment;
 #line 1747 "/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", _tmp50_);
-#line 12927 "PiwigoPublishing.c"
+#line 12937 "PiwigoPublishing.c"
 		} else {
 			PublishingPiwigoPublishingParameters* _tmp51_ = NULL;
 			gboolean _tmp52_ = FALSE;
@@ -12949,20 +12959,20 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 			_tmp52_ = _tmp51_->title_as_comment;
 #line 1752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_tmp52_) {
-#line 12937 "PiwigoPublishing.c"
+#line 12947 "PiwigoPublishing.c"
 				const gchar* _tmp53_ = NULL;
 #line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp53_ = name;
 #line 1753 "/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", _tmp53_);
-#line 12943 "PiwigoPublishing.c"
+#line 12953 "PiwigoPublishing.c"
 			} else {
 				const gchar* _tmp54_ = NULL;
 #line 1755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp54_ = name;
 #line 1755 "/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", _tmp54_);
-#line 12950 "PiwigoPublishing.c"
+#line 12960 "PiwigoPublishing.c"
 			}
 		}
 	}
@@ -13002,19 +13012,19 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 	_tmp66_ = _tmp65_->no_upload_tags;
 #line 1762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!_tmp66_) {
-#line 12990 "PiwigoPublishing.c"
+#line 13000 "PiwigoPublishing.c"
 		const gchar* _tmp67_ = NULL;
 #line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp67_ = tags;
 #line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (g_strcmp0 (_tmp67_, "") != 0) {
-#line 12996 "PiwigoPublishing.c"
+#line 13006 "PiwigoPublishing.c"
 			const gchar* _tmp68_ = NULL;
 #line 1764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp68_ = tags;
 #line 1764 "/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", _tmp68_);
-#line 13002 "PiwigoPublishing.c"
+#line 13012 "PiwigoPublishing.c"
 		}
 	}
 #line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -13026,27 +13036,87 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 #line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	disposition_table = _tmp71_;
 #line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp72_ = g_strdup ("filename");
-#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp73_ = publishable;
+	_tmp72_ = publishable;
 #line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp74_ = spit_publishing_publishable_get_param_string (_tmp73_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
+	_tmp73_ = spit_publishing_publishable_get_param_string (_tmp72_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
 #line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp75_ = _tmp74_;
-#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp76_ = soup_uri_encode (_tmp75_, NULL);
-#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_hash_table_insert (disposition_table, _tmp72_, _tmp76_);
-#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_free0 (_tmp75_);
+	basename = _tmp73_;
+#line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp75_ = basename;
+#line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp76_ = g_utf8_strdown (_tmp75_, (gssize) -1);
+#line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp77_ = _tmp76_;
+#line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp78_ = g_str_has_suffix (_tmp77_, ".jpeg");
+#line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp79_ = !_tmp78_;
+#line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_free0 (_tmp77_);
+#line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	if (_tmp79_) {
+#line 13043 "PiwigoPublishing.c"
+		const gchar* _tmp80_ = NULL;
+		gchar* _tmp81_ = NULL;
+		gchar* _tmp82_ = NULL;
+		gboolean _tmp83_ = FALSE;
+#line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp80_ = basename;
+#line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp81_ = g_utf8_strdown (_tmp80_, (gssize) -1);
+#line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp82_ = _tmp81_;
+#line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp83_ = g_str_has_suffix (_tmp82_, ".jpg");
+#line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp74_ = !_tmp83_;
+#line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_g_free0 (_tmp82_);
+#line 13060 "PiwigoPublishing.c"
+	} else {
+#line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp74_ = FALSE;
+#line 13064 "PiwigoPublishing.c"
+	}
+#line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	if (_tmp74_) {
+#line 13068 "PiwigoPublishing.c"
+		const gchar* _tmp84_ = NULL;
+		gchar* _tmp85_ = NULL;
 #line 1779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp77_ = g_strdup ("name");
+		_tmp84_ = basename;
 #line 1779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp78_ = g_strdup ("image");
+		_tmp85_ = g_strconcat (_tmp84_, ".jpg", NULL);
 #line 1779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_hash_table_insert (disposition_table, _tmp77_, _tmp78_);
+		_g_free0 (basename);
+#line 1779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		basename = _tmp85_;
+#line 13079 "PiwigoPublishing.c"
+	}
+#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp86_ = disposition_table;
+#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp87_ = g_strdup ("filename");
 #line 1781 "/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);
+	_tmp88_ = basename;
+#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp89_ = soup_uri_encode (_tmp88_, NULL);
+#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_hash_table_insert (_tmp86_, _tmp87_, _tmp89_);
+#line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp90_ = disposition_table;
+#line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp91_ = g_strdup ("name");
+#line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp92_ = g_strdup ("image");
+#line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_hash_table_insert (_tmp90_, _tmp91_, _tmp92_);
+#line 1784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp93_ = disposition_table;
+#line 1784 "/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), _tmp93_);
+#line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_free0 (basename);
 #line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_hash_table_unref0 (disposition_table);
 #line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -13059,14 +13129,14 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 	keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL);
 #line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 13047 "PiwigoPublishing.c"
+#line 13117 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_new (PublishingPiwigoSession* session, PublishingPiwigoPublishingParameters* parameters, SpitPublishingPublishable* publishable) {
 #line 1717 "/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 13054 "PiwigoPublishing.c"
+#line 13124 "PiwigoPublishing.c"
 }
 
 
@@ -13077,7 +13147,7 @@ static void publishing_piwigo_images_add_transaction_class_init (PublishingPiwig
 	((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_piwigo_images_add_transaction_finalize;
 #line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingPiwigoImagesAddTransactionPrivate));
-#line 13065 "PiwigoPublishing.c"
+#line 13135 "PiwigoPublishing.c"
 }
 
 
@@ -13086,7 +13156,7 @@ static void publishing_piwigo_images_add_transaction_instance_init (PublishingPi
 	self->priv = PUBLISHING_PIWIGO_IMAGES_ADD_TRANSACTION_GET_PRIVATE (self);
 #line 1715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->parameters = NULL;
-#line 13074 "PiwigoPublishing.c"
+#line 13144 "PiwigoPublishing.c"
 }
 
 
@@ -13098,7 +13168,7 @@ static void publishing_piwigo_images_add_transaction_finalize (PublishingRESTSup
 	_publishing_piwigo_publishing_parameters_unref0 (self->priv->parameters);
 #line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_piwigo_images_add_transaction_parent_class)->finalize (obj);
-#line 13086 "PiwigoPublishing.c"
+#line 13156 "PiwigoPublishing.c"
 }
 
 
diff --git a/plugins/shotwell-publishing/PiwigoPublishing.vala b/plugins/shotwell-publishing/PiwigoPublishing.vala
index 60219a6..15d118b 100644
--- a/plugins/shotwell-publishing/PiwigoPublishing.vala
+++ b/plugins/shotwell-publishing/PiwigoPublishing.vala
@@ -1773,9 +1773,12 @@ private class ImagesAddTransaction : Publishing.RESTSupport.UploadTransaction {
 
         GLib.HashTable<string, string> disposition_table =
             new GLib.HashTable<string, string>(GLib.str_hash, GLib.str_equal);
-        disposition_table.insert("filename",  Soup.URI.encode(
-            publishable.get_param_string(
-                Spit.Publishing.Publishable.PARAM_STRING_BASENAME), null));
+        var basename = publishable.get_param_string(Spit.Publishing.Publishable.PARAM_STRING_BASENAME);
+        if (!basename.down().has_suffix(".jpeg") &&
+            !basename.down().has_suffix(".jpg")) {
+            basename += ".jpg";
+        }
+        disposition_table.insert("filename",  Soup.URI.encode(basename, null));
         disposition_table.insert("name", "image");
 
         set_binary_disposition_table(disposition_table);
diff --git a/plugins/shotwell-publishing/YouTubePublishing.c b/plugins/shotwell-publishing/YouTubePublishing.c
index 21d4ad9..0c3d84e 100644
--- a/plugins/shotwell-publishing/YouTubePublishing.c
+++ b/plugins/shotwell-publishing/YouTubePublishing.c
@@ -16,12 +16,12 @@
 #include <gio/gio.h>
 #include "shotwell-plugin-common.h"
 #include <glib/gi18n-lib.h>
-#include <libxml/tree.h>
+#include "gdata/gdata.h"
+#include <libsoup/soup.h>
 #include <float.h>
 #include <math.h>
 #include <gtk/gtk.h>
-#include <libsoup/soup.h>
-#include <glib/gstdio.h>
+#include "shotwell-authenticator.h"
 #include <gobject/gvaluecollector.h>
 
 
@@ -60,23 +60,22 @@ typedef struct _PublishingYouTubePublishingParameters PublishingYouTubePublishin
 typedef struct _PublishingYouTubePublishingParametersClass PublishingYouTubePublishingParametersClass;
 typedef struct _PublishingYouTubePublishingParametersPrivate PublishingYouTubePublishingParametersPrivate;
 typedef struct _PublishingYouTubeParamSpecPublishingParameters PublishingYouTubeParamSpecPublishingParameters;
-typedef struct _PublishingYouTubeYouTubePublisherPrivate PublishingYouTubeYouTubePublisherPrivate;
-#define _publishing_you_tube_publishing_parameters_unref0(var) ((var == NULL) ? NULL : (var = (publishing_you_tube_publishing_parameters_unref (var), NULL)))
-#define _publishing_rest_support_session_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_session_unref (var), NULL)))
 
-#define PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_TYPE_CHANNEL_DIRECTORY_TRANSACTION (publishing_you_tube_you_tube_publisher_channel_directory_transaction_get_type ())
-#define PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_CHANNEL_DIRECTORY_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_TYPE_CHANNEL_DIRECTORY_TRANSACTION, PublishingYouTubeYouTubePublisherChannelDirectoryTransaction))
-#define PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_CHANNEL_DIRECTORY_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_TYPE_CHANNEL_DIRECTORY_TRANSACTION, PublishingYouTubeYouTubePublisherChannelDirectoryTransactionClass))
-#define PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_IS_CHANNEL_DIRECTORY_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_TYPE_CHANNEL_DIRECTORY_TRANSACTION))
-#define PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_IS_CHANNEL_DIRECTORY_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_TYPE_CHANNEL_DIRECTORY_TRANSACTION))
-#define PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_CHANNEL_DIRECTORY_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_TYPE_CHANNEL_DIRECTORY_TRANSACTION, PublishingYouTubeYouTubePublisherChannelDirectoryTransactionClass))
+#define PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_AUTHORIZER (publishing_you_tube_you_tube_authorizer_get_type ())
+#define PUBLISHING_YOU_TUBE_YOU_TUBE_AUTHORIZER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_AUTHORIZER, PublishingYouTubeYouTubeAuthorizer))
+#define PUBLISHING_YOU_TUBE_YOU_TUBE_AUTHORIZER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_AUTHORIZER, PublishingYouTubeYouTubeAuthorizerClass))
+#define PUBLISHING_YOU_TUBE_IS_YOU_TUBE_AUTHORIZER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_AUTHORIZER))
+#define PUBLISHING_YOU_TUBE_IS_YOU_TUBE_AUTHORIZER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_AUTHORIZER))
+#define PUBLISHING_YOU_TUBE_YOU_TUBE_AUTHORIZER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_AUTHORIZER, PublishingYouTubeYouTubeAuthorizerClass))
 
-typedef struct _PublishingYouTubeYouTubePublisherChannelDirectoryTransaction PublishingYouTubeYouTubePublisherChannelDirectoryTransaction;
-typedef struct _PublishingYouTubeYouTubePublisherChannelDirectoryTransactionClass PublishingYouTubeYouTubePublisherChannelDirectoryTransactionClass;
-#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)))
+typedef struct _PublishingYouTubeYouTubeAuthorizer PublishingYouTubeYouTubeAuthorizer;
+typedef struct _PublishingYouTubeYouTubeAuthorizerClass PublishingYouTubeYouTubeAuthorizerClass;
+typedef struct _PublishingYouTubeYouTubeAuthorizerPrivate PublishingYouTubeYouTubeAuthorizerPrivate;
+#define _publishing_rest_support_session_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_session_unref (var), NULL)))
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+typedef struct _PublishingYouTubeYouTubePublisherPrivate PublishingYouTubeYouTubePublisherPrivate;
+#define _publishing_you_tube_publishing_parameters_unref0(var) ((var == NULL) ? NULL : (var = (publishing_you_tube_publishing_parameters_unref (var), NULL)))
+#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 
 #define PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE (publishing_you_tube_publishing_options_pane_get_type ())
 #define PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYouTubePublishingOptionsPane))
@@ -98,7 +97,6 @@ typedef struct _PublishingYouTubePublishingOptionsPaneClass PublishingYouTubePub
 typedef struct _PublishingYouTubeUploader PublishingYouTubeUploader;
 typedef struct _PublishingYouTubeUploaderClass PublishingYouTubeUploaderClass;
 #define _publishing_rest_support_batch_uploader_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_batch_uploader_unref (var), NULL)))
-typedef struct _PublishingYouTubeYouTubePublisherChannelDirectoryTransactionPrivate PublishingYouTubeYouTubePublisherChannelDirectoryTransactionPrivate;
 typedef struct _PublishingYouTubePublishingOptionsPanePrivate PublishingYouTubePublishingOptionsPanePrivate;
 
 #define PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION (publishing_you_tube_publishing_options_pane_privacy_description_get_type ())
@@ -125,8 +123,10 @@ typedef struct _PublishingYouTubePublishingOptionsPaneParamSpecPrivacyDescriptio
 typedef struct _PublishingYouTubeUploadTransaction PublishingYouTubeUploadTransaction;
 typedef struct _PublishingYouTubeUploadTransactionClass PublishingYouTubeUploadTransactionClass;
 typedef struct _PublishingYouTubeUploadTransactionPrivate PublishingYouTubeUploadTransactionPrivate;
-#define __vala_SoupBuffer_free0(var) ((var == NULL) ? NULL : (var = (_vala_SoupBuffer_free (var), NULL)))
-#define __vala_SoupMultipart_free0(var) ((var == NULL) ? NULL : (var = (_vala_SoupMultipart_free (var), NULL)))
+typedef struct _Block1Data Block1Data;
+#define _g_main_loop_unref0(var) ((var == NULL) ? NULL : (var = (g_main_loop_unref (var), NULL)))
+#define _publishing_rest_support_transaction_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_transaction_unref (var), NULL)))
+typedef struct _PublishingYouTubeUploadTransactionSpliceWithProgressData PublishingYouTubeUploadTransactionSpliceWithProgressData;
 typedef struct _PublishingYouTubeUploaderPrivate PublishingYouTubeUploaderPrivate;
 #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
@@ -161,7 +161,6 @@ struct _PublishingYouTubePublishingParametersClass {
 
 struct _PublishingYouTubePublishingParametersPrivate {
 	PublishingYouTubePrivacySetting privacy;
-	gchar* channel_name;
 	gchar* user_name;
 };
 
@@ -169,6 +168,20 @@ struct _PublishingYouTubeParamSpecPublishingParameters {
 	GParamSpec parent_instance;
 };
 
+struct _PublishingYouTubeYouTubeAuthorizer {
+	GObject parent_instance;
+	PublishingYouTubeYouTubeAuthorizerPrivate * priv;
+};
+
+struct _PublishingYouTubeYouTubeAuthorizerClass {
+	GObjectClass parent_class;
+};
+
+struct _PublishingYouTubeYouTubeAuthorizerPrivate {
+	PublishingRESTSupportGoogleSession* session;
+	SpitPublishingAuthenticator* authenticator;
+};
+
 struct _PublishingYouTubeYouTubePublisher {
 	PublishingRESTSupportGooglePublisher parent_instance;
 	PublishingYouTubeYouTubePublisherPrivate * priv;
@@ -180,20 +193,12 @@ struct _PublishingYouTubeYouTubePublisherClass {
 
 struct _PublishingYouTubeYouTubePublisherPrivate {
 	gboolean running;
-	gchar* refresh_token;
 	PublishingYouTubePublishingParameters* publishing_parameters;
 	SpitPublishingProgressCallback progress_reporter;
 	gpointer progress_reporter_target;
 	GDestroyNotify progress_reporter_target_destroy_notify;
-};
-
-struct _PublishingYouTubeYouTubePublisherChannelDirectoryTransaction {
-	PublishingRESTSupportGooglePublisherAuthenticatedTransaction parent_instance;
-	PublishingYouTubeYouTubePublisherChannelDirectoryTransactionPrivate * priv;
-};
-
-struct _PublishingYouTubeYouTubePublisherChannelDirectoryTransactionClass {
-	PublishingRESTSupportGooglePublisherAuthenticatedTransactionClass parent_class;
+	SpitPublishingAuthenticator* authenticator;
+	GDataYouTubeService* youtube_service;
 };
 
 struct _PublishingYouTubePublishingOptionsPane {
@@ -208,7 +213,6 @@ struct _PublishingYouTubePublishingOptionsPaneClass {
 struct _PublishingYouTubePublishingOptionsPanePrivate {
 	GtkBox* pane_widget;
 	GtkComboBoxText* privacy_combo;
-	GtkLabel* publish_to_label;
 	GtkLabel* login_identity_label;
 	GtkButton* publish_button;
 	GtkButton* logout_button;
@@ -250,6 +254,47 @@ struct _PublishingYouTubeUploadTransactionPrivate {
 	PublishingYouTubePublishingParameters* parameters;
 	PublishingRESTSupportGoogleSession* session;
 	SpitPublishingPublishable* publishable;
+	GDataYouTubeService* youtube_service;
+};
+
+struct _Block1Data {
+	int _ref_count_;
+	PublishingYouTubeUploadTransaction* self;
+	GMainLoop* loop;
+};
+
+struct _PublishingYouTubeUploadTransactionSpliceWithProgressData {
+	int _state_;
+	GObject* _source_object_;
+	GAsyncResult* _res_;
+	GSimpleAsyncResult* _async_result;
+	PublishingYouTubeUploadTransaction* self;
+	GFileInfo* info;
+	GInputStream* input;
+	GOutputStream* output;
+	gint64 total_bytes;
+	GFileInfo* _tmp0_;
+	gint64 _tmp1_;
+	gint64 bytes_to_write;
+	gint64 _tmp2_;
+	guint8 buffer[8192];
+	gint64 _tmp3_;
+	gssize bytes_read;
+	GInputStream* _tmp4_;
+	gssize _tmp5_;
+	gssize _tmp6_;
+	gssize bytes_written;
+	GOutputStream* _tmp7_;
+	gssize _tmp8_;
+	gssize _tmp9_;
+	gint64 _tmp10_;
+	gssize _tmp11_;
+	gint64 _tmp12_;
+	gint64 _tmp13_;
+	gint64 _tmp14_;
+	GOutputStream* _tmp15_;
+	GInputStream* _tmp16_;
+	GError * _inner_error_;
 };
 
 struct _PublishingYouTubeUploader {
@@ -263,6 +308,7 @@ struct _PublishingYouTubeUploaderClass {
 
 struct _PublishingYouTubeUploaderPrivate {
 	PublishingYouTubePublishingParameters* parameters;
+	GDataYouTubeService* youtube_service;
 };
 
 
@@ -275,8 +321,9 @@ static gint _you_tube_service_icon_pixbuf_set_size_ = 0;
 static SpitPluggableIface* you_tube_service_spit_pluggable_parent_iface = NULL;
 static SpitPublishingServiceIface* you_tube_service_spit_publishing_service_parent_iface = NULL;
 static gpointer publishing_you_tube_publishing_parameters_parent_class = NULL;
+static gpointer publishing_you_tube_you_tube_authorizer_parent_class = NULL;
+static GDataAuthorizerInterface* publishing_you_tube_you_tube_authorizer_gdata_authorizer_parent_iface = NULL;
 static gpointer publishing_you_tube_you_tube_publisher_parent_class = NULL;
-static gpointer publishing_you_tube_you_tube_publisher_channel_directory_transaction_parent_class = NULL;
 static gpointer publishing_you_tube_publishing_options_pane_parent_class = NULL;
 static gpointer publishing_you_tube_publishing_options_pane_privacy_description_parent_class = NULL;
 static SpitPublishingDialogPaneIface* publishing_you_tube_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL;
@@ -302,13 +349,7 @@ GType publishing_you_tube_you_tube_publisher_get_type (void) G_GNUC_CONST;
 static SpitPublishingPublisherMediaType you_tube_service_real_get_supported_media (SpitPublishingService* base);
 static void you_tube_service_real_activation (SpitPluggable* base, gboolean enabled);
 static void you_tube_service_finalize (GObject* obj);
-#define PUBLISHING_YOU_TUBE_SERVICE_WELCOME_MESSAGE _ ("You are not currently logged into YouTube.\n" \
-"\n" \
-"You must have already signed up for a Google account and set it up for" \
-" use with YouTube to continue. You can set up most accounts by using y" \
-"our browser to log into the YouTube site at least once.")
-#define PUBLISHING_YOU_TUBE_DEVELOPER_KEY "AI39si5VEpzWK0z-pzo4fonEj9E4driCpEs9lK8y3HJsbbebIIRWqW3bIyGr42bjQv-N3s" \
-"iAfqVoM8XNmtbbp5x2gpbjiSAMTQ"
+#define PUBLISHING_YOU_TUBE_DEVELOPER_KEY "AIzaSyB6hLnm0n5j8Y6Bkvh9bz3i8ADM2bJdYeY"
 GType publishing_you_tube_privacy_setting_get_type (void) G_GNUC_CONST;
 gpointer publishing_you_tube_publishing_parameters_ref (gpointer instance);
 void publishing_you_tube_publishing_parameters_unref (gpointer instance);
@@ -325,29 +366,29 @@ PublishingYouTubePublishingParameters* publishing_you_tube_publishing_parameters
 PublishingYouTubePublishingParameters* publishing_you_tube_publishing_parameters_construct (GType object_type);
 PublishingYouTubePrivacySetting publishing_you_tube_publishing_parameters_get_privacy (PublishingYouTubePublishingParameters* self);
 void publishing_you_tube_publishing_parameters_set_privacy (PublishingYouTubePublishingParameters* self, PublishingYouTubePrivacySetting privacy);
-gchar* publishing_you_tube_publishing_parameters_get_channel_name (PublishingYouTubePublishingParameters* self);
-void publishing_you_tube_publishing_parameters_set_channel_name (PublishingYouTubePublishingParameters* self, const gchar* channel_name);
 gchar* publishing_you_tube_publishing_parameters_get_user_name (PublishingYouTubePublishingParameters* self);
 void publishing_you_tube_publishing_parameters_set_user_name (PublishingYouTubePublishingParameters* self, const gchar* user_name);
 static void publishing_you_tube_publishing_parameters_finalize (PublishingYouTubePublishingParameters* obj);
+GType publishing_you_tube_you_tube_authorizer_get_type (void) G_GNUC_CONST;
+#define PUBLISHING_YOU_TUBE_YOU_TUBE_AUTHORIZER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_AUTHORIZER, PublishingYouTubeYouTubeAuthorizerPrivate))
+enum  {
+	PUBLISHING_YOU_TUBE_YOU_TUBE_AUTHORIZER_DUMMY_PROPERTY
+};
+PublishingYouTubeYouTubeAuthorizer* publishing_you_tube_you_tube_authorizer_new (PublishingRESTSupportGoogleSession* session, SpitPublishingAuthenticator* authenticator);
+PublishingYouTubeYouTubeAuthorizer* publishing_you_tube_you_tube_authorizer_construct (GType object_type, PublishingRESTSupportGoogleSession* session, SpitPublishingAuthenticator* authenticator);
+static gboolean publishing_you_tube_you_tube_authorizer_real_is_authorized_for_domain (GDataAuthorizer* base, GDataAuthorizationDomain* domain);
+static void publishing_you_tube_you_tube_authorizer_real_process_request (GDataAuthorizer* base, GDataAuthorizationDomain* domain, SoupMessage* message);
+static gboolean publishing_you_tube_you_tube_authorizer_real_refresh_authorization (GDataAuthorizer* base, GCancellable* cancellable, GError** error);
+static void publishing_you_tube_you_tube_authorizer_finalize (GObject* obj);
 #define PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, PublishingYouTubeYouTubePublisherPrivate))
 enum  {
 	PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_DUMMY_PROPERTY
 };
 static gboolean publishing_you_tube_you_tube_publisher_real_is_running (PublishingRESTSupportGooglePublisher* base);
 static void publishing_you_tube_you_tube_publisher_real_start (PublishingRESTSupportGooglePublisher* base);
-static void publishing_you_tube_you_tube_publisher_do_show_service_welcome_pane (PublishingYouTubeYouTubePublisher* self);
 static void publishing_you_tube_you_tube_publisher_real_stop (PublishingRESTSupportGooglePublisher* base);
-static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper (PublishingYouTubeYouTubePublisher* self, xmlNode* document_root, GError** error);
-static void publishing_you_tube_you_tube_publisher_on_service_welcome_login (PublishingYouTubeYouTubePublisher* self);
 static void publishing_you_tube_you_tube_publisher_real_on_login_flow_complete (PublishingRESTSupportGooglePublisher* base);
-static void publishing_you_tube_you_tube_publisher_do_fetch_account_information (PublishingYouTubeYouTubePublisher* self);
-static void publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_complete (PublishingYouTubeYouTubePublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_error (PublishingYouTubeYouTubePublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err);
-static void _publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static GType publishing_you_tube_you_tube_publisher_channel_directory_transaction_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
-static void publishing_you_tube_you_tube_publisher_do_parse_and_display_account_information (PublishingYouTubeYouTubePublisher* self, PublishingYouTubeYouTubePublisherChannelDirectoryTransaction* transaction);
+static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pane (PublishingYouTubeYouTubePublisher* self);
 static void publishing_you_tube_you_tube_publisher_on_publishing_options_logout (PublishingYouTubeYouTubePublisher* self);
 static void publishing_you_tube_you_tube_publisher_on_publishing_options_publish (PublishingYouTubeYouTubePublisher* self);
 static void publishing_you_tube_you_tube_publisher_do_upload (PublishingYouTubeYouTubePublisher* self);
@@ -357,26 +398,17 @@ static void _publishing_you_tube_you_tube_publisher_on_upload_complete_publishin
 static void publishing_you_tube_you_tube_publisher_on_upload_error (PublishingYouTubeYouTubePublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err);
 static void _publishing_you_tube_you_tube_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self);
 static void publishing_you_tube_you_tube_publisher_do_show_success_pane (PublishingYouTubeYouTubePublisher* self);
-static void _publishing_you_tube_you_tube_publisher_on_service_welcome_login_spit_publishing_login_callback (gpointer self);
-static PublishingYouTubeYouTubePublisherChannelDirectoryTransaction* publishing_you_tube_you_tube_publisher_channel_directory_transaction_new (PublishingRESTSupportGoogleSession* session);
-static PublishingYouTubeYouTubePublisherChannelDirectoryTransaction* publishing_you_tube_you_tube_publisher_channel_directory_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session);
-static gchar* publishing_you_tube_you_tube_publisher_channel_directory_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc);
-static gchar* _publishing_you_tube_you_tube_publisher_channel_directory_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self);
-static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pane (PublishingYouTubeYouTubePublisher* self);
 GType publishing_you_tube_publishing_options_pane_get_type (void) G_GNUC_CONST;
-PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_pane_new (SpitPublishingPluginHost* host, GtkBuilder* builder, PublishingYouTubePublishingParameters* publishing_parameters);
-PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_pane_construct (GType object_type, SpitPublishingPluginHost* host, GtkBuilder* builder, PublishingYouTubePublishingParameters* publishing_parameters);
+PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_pane_new (SpitPublishingAuthenticator* authenticator, SpitPublishingPluginHost* host, GtkBuilder* builder, PublishingYouTubePublishingParameters* publishing_parameters);
+PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_pane_construct (GType object_type, SpitPublishingAuthenticator* authenticator, SpitPublishingPluginHost* host, GtkBuilder* builder, PublishingYouTubePublishingParameters* publishing_parameters);
 static void _publishing_you_tube_you_tube_publisher_on_publishing_options_publish_publishing_you_tube_publishing_options_pane_publish (PublishingYouTubePublishingOptionsPane* _sender, gpointer self);
 static void _publishing_you_tube_you_tube_publisher_on_publishing_options_logout_publishing_you_tube_publishing_options_pane_logout (PublishingYouTubePublishingOptionsPane* _sender, gpointer self);
 GType publishing_you_tube_uploader_get_type (void) G_GNUC_CONST;
-PublishingYouTubeUploader* publishing_you_tube_uploader_new (PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingYouTubePublishingParameters* parameters);
-PublishingYouTubeUploader* publishing_you_tube_uploader_construct (GType object_type, PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingYouTubePublishingParameters* parameters);
+PublishingYouTubeUploader* publishing_you_tube_uploader_new (GDataYouTubeService* youtube_service, PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingYouTubePublishingParameters* parameters);
+PublishingYouTubeUploader* publishing_you_tube_uploader_construct (GType object_type, GDataYouTubeService* youtube_service, PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingYouTubePublishingParameters* parameters);
 static void _publishing_you_tube_you_tube_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self);
 static void publishing_you_tube_you_tube_publisher_real_do_logout (PublishingRESTSupportGooglePublisher* base);
-enum  {
-	PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_CHANNEL_DIRECTORY_TRANSACTION_DUMMY_PROPERTY
-};
-#define PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_CHANNEL_DIRECTORY_TRANSACTION_ENDPOINT_URL "https://gdata.youtube.com/feeds/users/default"
+static SpitPublishingAuthenticator* publishing_you_tube_you_tube_publisher_real_get_authenticator (PublishingRESTSupportGooglePublisher* base);
 static void publishing_you_tube_you_tube_publisher_finalize (GObject* obj);
 static gpointer publishing_you_tube_publishing_options_pane_privacy_description_ref (gpointer instance);
 static void publishing_you_tube_publishing_options_pane_privacy_description_unref (gpointer instance);
@@ -397,9 +429,9 @@ static void _publishing_you_tube_publishing_options_pane_on_publish_clicked_gtk_
 static void publishing_you_tube_publishing_options_pane_update_publish_button_sensitivity (PublishingYouTubePublishingOptionsPane* self);
 static PublishingYouTubePublishingOptionsPanePrivacyDescription* publishing_you_tube_publishing_options_pane_privacy_description_new (const gchar* description, PublishingYouTubePrivacySetting privacy_setting);
 static PublishingYouTubePublishingOptionsPanePrivacyDescription* publishing_you_tube_publishing_options_pane_privacy_description_construct (GType object_type, const gchar* description, PublishingYouTubePrivacySetting privacy_setting);
-static void _vala_array_add31 (PublishingYouTubePublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value);
 static void _vala_array_add32 (PublishingYouTubePublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value);
 static void _vala_array_add33 (PublishingYouTubePublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value);
+static void _vala_array_add34 (PublishingYouTubePublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value);
 static GtkWidget* publishing_you_tube_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base);
 static SpitPublishingDialogPaneGeometryOptions publishing_you_tube_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
 static void publishing_you_tube_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
@@ -415,31 +447,18 @@ enum  {
 	PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_DUMMY_PROPERTY
 };
 #define PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_ENDPOINT_URL "https://uploads.gdata.youtube.com/feeds/api/users/default/uploads"
-#define PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_UNLISTED_XML "<yt:accessControl action='list' permission='denied'/>"
-#define PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_PRIVATE_XML "<yt:private/>"
-#define PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_METADATA_TEMPLATE "<?xml version='1.0'?>\n" \
-"                                                <entry xmlns='http://w" \
-"ww.w3.org/2005/Atom'\n" \
-"                                                xmlns:media='http://se" \
-"arch.yahoo.com/mrss/'\n" \
-"                                                xmlns:yt='http://gdata" \
-".youtube.com/schemas/2007'>\n" \
-"                                                <media:group>\n" \
-"                                                    <media:title type=" \
-"'plain'>%s</media:title>\n" \
-"                                                    <media:category\n" \
-"                                                    scheme='http://gda" \
-"ta.youtube.com/schemas/2007/categories.cat'>People\n" \
-"                                                    </media:category>\n" \
-"                                                    %s\n" \
-"                                                </media:group>\n" \
-"                                                    %s\n" \
-"                                                </entry>"
-PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_new (PublishingRESTSupportGoogleSession* session, PublishingYouTubePublishingParameters* parameters, SpitPublishingPublishable* publishable);
-PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session, PublishingYouTubePublishingParameters* parameters, SpitPublishingPublishable* publishable);
+PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_new (GDataYouTubeService* youtube_service, PublishingRESTSupportGoogleSession* session, PublishingYouTubePublishingParameters* parameters, SpitPublishingPublishable* publishable);
+PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_construct (GType object_type, GDataYouTubeService* youtube_service, PublishingRESTSupportGoogleSession* session, PublishingYouTubePublishingParameters* parameters, SpitPublishingPublishable* publishable);
 static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error);
-static void _vala_SoupBuffer_free (SoupBuffer* self);
-static void _vala_SoupMultipart_free (SoupMultipart* self);
+static Block1Data* block1_data_ref (Block1Data* _data1_);
+static void block1_data_unref (void * _userdata_);
+static void publishing_you_tube_upload_transaction_splice_with_progress (PublishingYouTubeUploadTransaction* self, GFileInfo* info, GInputStream* input, GOutputStream* output, GAsyncReadyCallback _callback_, gpointer _user_data_);
+static void publishing_you_tube_upload_transaction_splice_with_progress_finish (PublishingYouTubeUploadTransaction* self, GAsyncResult* _res_, GError** error);
+static void ___lambda4_ (Block1Data* _data1_, GObject* obj, GAsyncResult* res);
+static void ____lambda4__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self);
+static void publishing_you_tube_upload_transaction_splice_with_progress_data_free (gpointer _data);
+static gboolean publishing_you_tube_upload_transaction_splice_with_progress_co (PublishingYouTubeUploadTransactionSpliceWithProgressData* _data_);
+static void publishing_you_tube_upload_transaction_splice_with_progress_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_);
 static void publishing_you_tube_upload_transaction_finalize (PublishingRESTSupportTransaction* obj);
 #define PUBLISHING_YOU_TUBE_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YOU_TUBE_TYPE_UPLOADER, PublishingYouTubeUploaderPrivate))
 enum  {
@@ -465,7 +484,7 @@ YouTubeService* you_tube_service_construct (GType object_type, GFile* resource_d
 	_tmp0__length1 = you_tube_service_icon_pixbuf_set_length1;
 #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 447 "YouTubePublishing.c"
+#line 488 "YouTubePublishing.c"
 		gint _tmp1_ = 0;
 		GdkPixbuf** _tmp2_ = NULL;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -478,18 +497,18 @@ YouTubeService* you_tube_service_construct (GType object_type, GFile* resource_d
 		you_tube_service_icon_pixbuf_set_length1 = _tmp1_;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_you_tube_service_icon_pixbuf_set_size_ = you_tube_service_icon_pixbuf_set_length1;
-#line 460 "YouTubePublishing.c"
+#line 501 "YouTubePublishing.c"
 	}
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self;
-#line 464 "YouTubePublishing.c"
+#line 505 "YouTubePublishing.c"
 }
 
 
 YouTubeService* you_tube_service_new (GFile* resource_directory) {
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return you_tube_service_construct (TYPE_YOU_TUBE_SERVICE, resource_directory);
-#line 471 "YouTubePublishing.c"
+#line 512 "YouTubePublishing.c"
 }
 
 
@@ -511,7 +530,7 @@ static gint you_tube_service_real_get_pluggable_interface (SpitPluggable* base,
 	result = _tmp2_;
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 493 "YouTubePublishing.c"
+#line 534 "YouTubePublishing.c"
 }
 
 
@@ -524,7 +543,7 @@ static const gchar* you_tube_service_real_get_id (SpitPluggable* base) {
 	result = "org.yorba.shotwell.publishing.youtube";
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 506 "YouTubePublishing.c"
+#line 547 "YouTubePublishing.c"
 }
 
 
@@ -537,14 +556,14 @@ static const gchar* you_tube_service_real_get_pluggable_name (SpitPluggable* bas
 	result = "YouTube";
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 519 "YouTubePublishing.c"
+#line 560 "YouTubePublishing.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 526 "YouTubePublishing.c"
+#line 567 "YouTubePublishing.c"
 }
 
 
@@ -555,17 +574,17 @@ static GdkPixbuf** _vala_array_dup9 (GdkPixbuf** self, int length) {
 	result = g_new0 (GdkPixbuf*, length + 1);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 537 "YouTubePublishing.c"
+#line 578 "YouTubePublishing.c"
 		GdkPixbuf* _tmp0_ = NULL;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		result[i] = _tmp0_;
-#line 543 "YouTubePublishing.c"
+#line 584 "YouTubePublishing.c"
 	}
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 547 "YouTubePublishing.c"
+#line 588 "YouTubePublishing.c"
 }
 
 
@@ -647,7 +666,7 @@ static void you_tube_service_real_get_info (SpitPluggable* base, SpitPluggableIn
 	(*info).icons = _tmp9_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	(*info).icons_length1 = _tmp9__length1;
-#line 629 "YouTubePublishing.c"
+#line 670 "YouTubePublishing.c"
 }
 
 
@@ -668,7 +687,7 @@ static SpitPublishingPublisher* you_tube_service_real_create_publisher (SpitPubl
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 650 "YouTubePublishing.c"
+#line 691 "YouTubePublishing.c"
 }
 
 
@@ -681,7 +700,7 @@ static SpitPublishingPublisherMediaType you_tube_service_real_get_supported_medi
 	result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO;
 #line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 663 "YouTubePublishing.c"
+#line 704 "YouTubePublishing.c"
 }
 
 
@@ -689,7 +708,7 @@ static void you_tube_service_real_activation (SpitPluggable* base, gboolean enab
 	YouTubeService * self;
 #line 51 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_YOU_TUBE_SERVICE, YouTubeService);
-#line 671 "YouTubePublishing.c"
+#line 712 "YouTubePublishing.c"
 }
 
 
@@ -698,7 +717,7 @@ static void you_tube_service_class_init (YouTubeServiceClass * klass) {
 	you_tube_service_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = you_tube_service_finalize;
-#line 680 "YouTubePublishing.c"
+#line 721 "YouTubePublishing.c"
 }
 
 
@@ -715,7 +734,7 @@ static void you_tube_service_spit_pluggable_interface_init (SpitPluggableIface *
 	iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) you_tube_service_real_get_info;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	iface->activation = (void (*)(SpitPluggable*, gboolean)) you_tube_service_real_activation;
-#line 697 "YouTubePublishing.c"
+#line 738 "YouTubePublishing.c"
 }
 
 
@@ -726,7 +745,7 @@ static void you_tube_service_spit_publishing_service_interface_init (SpitPublish
 	iface->create_publisher = (SpitPublishingPublisher* (*)(SpitPublishingService*, SpitPublishingPluginHost*)) you_tube_service_real_create_publisher;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	iface->get_supported_media = (SpitPublishingPublisherMediaType (*)(SpitPublishingService*)) you_tube_service_real_get_supported_media;
-#line 708 "YouTubePublishing.c"
+#line 749 "YouTubePublishing.c"
 }
 
 
@@ -740,7 +759,7 @@ static void you_tube_service_finalize (GObject* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_YOU_TUBE_SERVICE, YouTubeService);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	G_OBJECT_CLASS (you_tube_service_parent_class)->finalize (obj);
-#line 722 "YouTubePublishing.c"
+#line 763 "YouTubePublishing.c"
 }
 
 
@@ -774,90 +793,51 @@ GType publishing_you_tube_privacy_setting_get_type (void) {
 
 PublishingYouTubePublishingParameters* publishing_you_tube_publishing_parameters_construct (GType object_type) {
 	PublishingYouTubePublishingParameters* self = NULL;
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = (PublishingYouTubePublishingParameters*) g_type_create_instance (object_type);
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->privacy = PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PRIVATE;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (self->priv->channel_name);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	self->priv->channel_name = NULL;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_free0 (self->priv->user_name);
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->user_name = NULL;
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self;
-#line 770 "YouTubePublishing.c"
+#line 807 "YouTubePublishing.c"
 }
 
 
 PublishingYouTubePublishingParameters* publishing_you_tube_publishing_parameters_new (void) {
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return publishing_you_tube_publishing_parameters_construct (PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_PARAMETERS);
-#line 777 "YouTubePublishing.c"
+#line 814 "YouTubePublishing.c"
 }
 
 
 PublishingYouTubePrivacySetting publishing_you_tube_publishing_parameters_get_privacy (PublishingYouTubePublishingParameters* self) {
 	PublishingYouTubePrivacySetting result = 0;
 	PublishingYouTubePrivacySetting _tmp0_ = 0;
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_PARAMETERS (self), 0);
-#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = self->priv->privacy;
-#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	result = _tmp0_;
-#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 792 "YouTubePublishing.c"
+#line 829 "YouTubePublishing.c"
 }
 
 
 void publishing_you_tube_publishing_parameters_set_privacy (PublishingYouTubePublishingParameters* self, PublishingYouTubePrivacySetting privacy) {
 	PublishingYouTubePrivacySetting _tmp0_ = 0;
-#line 83 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_PARAMETERS (self));
-#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = privacy;
-#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->privacy = _tmp0_;
-#line 804 "YouTubePublishing.c"
-}
-
-
-gchar* publishing_you_tube_publishing_parameters_get_channel_name (PublishingYouTubePublishingParameters* self) {
-	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_return_val_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_PARAMETERS (self), NULL);
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp0_ = self->priv->channel_name;
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	result = _tmp1_;
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	return result;
-#line 822 "YouTubePublishing.c"
-}
-
-
-void publishing_you_tube_publishing_parameters_set_channel_name (PublishingYouTubePublishingParameters* self, const gchar* channel_name) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-#line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_PARAMETERS (self));
-#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp0_ = channel_name;
-#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (self->priv->channel_name);
-#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	self->priv->channel_name = _tmp1_;
-#line 839 "YouTubePublishing.c"
+#line 841 "YouTubePublishing.c"
 }
 
 
@@ -865,246 +845,244 @@ gchar* publishing_you_tube_publishing_parameters_get_user_name (PublishingYouTub
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 83 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_PARAMETERS (self), NULL);
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = self->priv->user_name;
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	result = _tmp1_;
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 857 "YouTubePublishing.c"
+#line 859 "YouTubePublishing.c"
 }
 
 
 void publishing_you_tube_publishing_parameters_set_user_name (PublishingYouTubePublishingParameters* self, const gchar* user_name) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_PARAMETERS (self));
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = user_name;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_free0 (self->priv->user_name);
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->user_name = _tmp1_;
-#line 874 "YouTubePublishing.c"
+#line 876 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_value_publishing_parameters_init (GValue* value) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 881 "YouTubePublishing.c"
+#line 883 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_value_publishing_parameters_free_value (GValue* value) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_you_tube_publishing_parameters_unref (value->data[0].v_pointer);
-#line 890 "YouTubePublishing.c"
+#line 892 "YouTubePublishing.c"
 	}
 }
 
 
 static void publishing_you_tube_value_publishing_parameters_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		dest_value->data[0].v_pointer = publishing_you_tube_publishing_parameters_ref (src_value->data[0].v_pointer);
-#line 900 "YouTubePublishing.c"
+#line 902 "YouTubePublishing.c"
 	} else {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 904 "YouTubePublishing.c"
+#line 906 "YouTubePublishing.c"
 	}
 }
 
 
 static gpointer publishing_you_tube_value_publishing_parameters_peek_pointer (const GValue* value) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return value->data[0].v_pointer;
-#line 912 "YouTubePublishing.c"
+#line 914 "YouTubePublishing.c"
 }
 
 
 static gchar* publishing_you_tube_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 919 "YouTubePublishing.c"
+#line 921 "YouTubePublishing.c"
 		PublishingYouTubePublishingParameters* object;
 		object = collect_values[0].v_pointer;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 926 "YouTubePublishing.c"
+#line 928 "YouTubePublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.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 930 "YouTubePublishing.c"
+#line 932 "YouTubePublishing.c"
 		}
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = publishing_you_tube_publishing_parameters_ref (object);
-#line 934 "YouTubePublishing.c"
+#line 936 "YouTubePublishing.c"
 	} else {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 938 "YouTubePublishing.c"
+#line 940 "YouTubePublishing.c"
 	}
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return NULL;
-#line 942 "YouTubePublishing.c"
+#line 944 "YouTubePublishing.c"
 }
 
 
 static gchar* publishing_you_tube_value_publishing_parameters_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingYouTubePublishingParameters** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (!object_p) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 953 "YouTubePublishing.c"
+#line 955 "YouTubePublishing.c"
 	}
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*object_p = NULL;
-#line 959 "YouTubePublishing.c"
+#line 961 "YouTubePublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 963 "YouTubePublishing.c"
+#line 965 "YouTubePublishing.c"
 	} else {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*object_p = publishing_you_tube_publishing_parameters_ref (value->data[0].v_pointer);
-#line 967 "YouTubePublishing.c"
+#line 969 "YouTubePublishing.c"
 	}
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return NULL;
-#line 971 "YouTubePublishing.c"
+#line 973 "YouTubePublishing.c"
 }
 
 
 GParamSpec* publishing_you_tube_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingYouTubeParamSpecPublishingParameters* spec;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_PARAMETERS), NULL);
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 985 "YouTubePublishing.c"
+#line 987 "YouTubePublishing.c"
 }
 
 
 gpointer publishing_you_tube_value_get_publishing_parameters (const GValue* value) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_PARAMETERS), NULL);
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return value->data[0].v_pointer;
-#line 994 "YouTubePublishing.c"
+#line 996 "YouTubePublishing.c"
 }
 
 
 void publishing_you_tube_value_set_publishing_parameters (GValue* value, gpointer v_object) {
 	PublishingYouTubePublishingParameters* old;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_PARAMETERS));
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	old = value->data[0].v_pointer;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (v_object) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_PARAMETERS));
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_you_tube_publishing_parameters_ref (value->data[0].v_pointer);
-#line 1014 "YouTubePublishing.c"
+#line 1016 "YouTubePublishing.c"
 	} else {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1018 "YouTubePublishing.c"
+#line 1020 "YouTubePublishing.c"
 	}
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (old) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_you_tube_publishing_parameters_unref (old);
-#line 1024 "YouTubePublishing.c"
+#line 1026 "YouTubePublishing.c"
 	}
 }
 
 
 void publishing_you_tube_value_take_publishing_parameters (GValue* value, gpointer v_object) {
 	PublishingYouTubePublishingParameters* old;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_PARAMETERS));
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	old = value->data[0].v_pointer;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (v_object) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_PARAMETERS));
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1043 "YouTubePublishing.c"
+#line 1045 "YouTubePublishing.c"
 	} else {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1047 "YouTubePublishing.c"
+#line 1049 "YouTubePublishing.c"
 	}
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (old) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_you_tube_publishing_parameters_unref (old);
-#line 1053 "YouTubePublishing.c"
+#line 1055 "YouTubePublishing.c"
 	}
 }
 
 
 static void publishing_you_tube_publishing_parameters_class_init (PublishingYouTubePublishingParametersClass * klass) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_publishing_parameters_parent_class = g_type_class_peek_parent (klass);
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	((PublishingYouTubePublishingParametersClass *) klass)->finalize = publishing_you_tube_publishing_parameters_finalize;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingYouTubePublishingParametersPrivate));
-#line 1065 "YouTubePublishing.c"
+#line 1067 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_publishing_parameters_instance_init (PublishingYouTubePublishingParameters * self) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv = PUBLISHING_YOU_TUBE_PUBLISHING_PARAMETERS_GET_PRIVATE (self);
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->ref_count = 1;
-#line 1074 "YouTubePublishing.c"
+#line 1076 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_publishing_parameters_finalize (PublishingYouTubePublishingParameters* obj) {
 	PublishingYouTubePublishingParameters * self;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_PARAMETERS, PublishingYouTubePublishingParameters);
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (self->priv->channel_name);
-#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_free0 (self->priv->user_name);
 #line 1088 "YouTubePublishing.c"
 }
@@ -1127,9 +1105,9 @@ GType publishing_you_tube_publishing_parameters_get_type (void) {
 gpointer publishing_you_tube_publishing_parameters_ref (gpointer instance) {
 	PublishingYouTubePublishingParameters* self;
 	self = instance;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return instance;
 #line 1113 "YouTubePublishing.c"
 }
@@ -1138,50 +1116,236 @@ gpointer publishing_you_tube_publishing_parameters_ref (gpointer instance) {
 void publishing_you_tube_publishing_parameters_unref (gpointer instance) {
 	PublishingYouTubePublishingParameters* self;
 	self = instance;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		PUBLISHING_YOU_TUBE_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self);
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
 #line 1126 "YouTubePublishing.c"
 	}
 }
 
 
+static gpointer _publishing_rest_support_session_ref0 (gpointer self) {
+#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	return self ? publishing_rest_support_session_ref (self) : NULL;
+#line 1134 "YouTubePublishing.c"
+}
+
+
+PublishingYouTubeYouTubeAuthorizer* publishing_you_tube_you_tube_authorizer_construct (GType object_type, PublishingRESTSupportGoogleSession* session, SpitPublishingAuthenticator* authenticator) {
+	PublishingYouTubeYouTubeAuthorizer * self = NULL;
+	PublishingRESTSupportGoogleSession* _tmp0_ = NULL;
+	PublishingRESTSupportGoogleSession* _tmp1_ = NULL;
+	SpitPublishingAuthenticator* _tmp2_ = NULL;
+	SpitPublishingAuthenticator* _tmp3_ = NULL;
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_return_val_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR (authenticator), NULL);
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	self = (PublishingYouTubeYouTubeAuthorizer*) g_object_new (object_type, NULL);
+#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp0_ = session;
+#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp1_ = _publishing_rest_support_session_ref0 (_tmp0_);
+#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_publishing_rest_support_session_unref0 (self->priv->session);
+#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	self->priv->session = _tmp1_;
+#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp2_ = authenticator;
+#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp3_ = _g_object_ref0 (_tmp2_);
+#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (self->priv->authenticator);
+#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	self->priv->authenticator = _tmp3_;
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	return self;
+#line 1168 "YouTubePublishing.c"
+}
+
+
+PublishingYouTubeYouTubeAuthorizer* publishing_you_tube_you_tube_authorizer_new (PublishingRESTSupportGoogleSession* session, SpitPublishingAuthenticator* authenticator) {
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	return publishing_you_tube_you_tube_authorizer_construct (PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_AUTHORIZER, session, authenticator);
+#line 1175 "YouTubePublishing.c"
+}
+
+
+static gboolean publishing_you_tube_you_tube_authorizer_real_is_authorized_for_domain (GDataAuthorizer* base, GDataAuthorizationDomain* domain) {
+	PublishingYouTubeYouTubeAuthorizer * self;
+	gboolean result = FALSE;
+#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_AUTHORIZER, PublishingYouTubeYouTubeAuthorizer);
+#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_return_val_if_fail (GDATA_IS_AUTHORIZATION_DOMAIN (domain), FALSE);
+#line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	result = TRUE;
+#line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	return result;
+#line 1190 "YouTubePublishing.c"
+}
+
+
+static void publishing_you_tube_you_tube_authorizer_real_process_request (GDataAuthorizer* base, GDataAuthorizationDomain* domain, SoupMessage* message) {
+	PublishingYouTubeYouTubeAuthorizer * self;
+	GDataAuthorizationDomain* _tmp0_ = NULL;
+	gchar* header = NULL;
+	PublishingRESTSupportGoogleSession* _tmp1_ = NULL;
+	gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+	gchar* _tmp4_ = NULL;
+	gchar* _tmp5_ = NULL;
+	SoupMessage* _tmp6_ = NULL;
+	SoupMessageHeaders* _tmp7_ = NULL;
+	const gchar* _tmp8_ = NULL;
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_AUTHORIZER, PublishingYouTubeYouTubeAuthorizer);
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_return_if_fail ((domain == NULL) || GDATA_IS_AUTHORIZATION_DOMAIN (domain));
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_return_if_fail (SOUP_IS_MESSAGE (message));
+#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp0_ = domain;
+#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	if (_tmp0_ == NULL) {
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		return;
+#line 1218 "YouTubePublishing.c"
+	}
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp1_ = self->priv->session;
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp2_ = publishing_rest_support_google_session_get_access_token (_tmp1_);
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp3_ = _tmp2_;
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp4_ = g_strdup_printf ("Bearer %s", _tmp3_);
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp5_ = _tmp4_;
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_free0 (_tmp3_);
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	header = _tmp5_;
+#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp6_ = message;
+#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp7_ = _tmp6_->request_headers;
+#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp8_ = header;
+#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	soup_message_headers_replace (_tmp7_, "Authorization", _tmp8_);
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_free0 (header);
+#line 1244 "YouTubePublishing.c"
+}
+
+
+static gboolean publishing_you_tube_you_tube_authorizer_real_refresh_authorization (GDataAuthorizer* base, GCancellable* cancellable, GError** error) {
+	PublishingYouTubeYouTubeAuthorizer * self;
+	gboolean result = FALSE;
+	SpitPublishingAuthenticator* _tmp0_ = NULL;
+#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_AUTHORIZER, PublishingYouTubeYouTubeAuthorizer);
+#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_return_val_if_fail ((cancellable == NULL) || G_IS_CANCELLABLE (cancellable), FALSE);
+#line 116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp0_ = self->priv->authenticator;
+#line 116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	spit_publishing_authenticator_refresh (_tmp0_);
+#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	result = TRUE;
+#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	return result;
+#line 1264 "YouTubePublishing.c"
+}
+
+
+static void publishing_you_tube_you_tube_authorizer_class_init (PublishingYouTubeYouTubeAuthorizerClass * klass) {
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	publishing_you_tube_you_tube_authorizer_parent_class = g_type_class_peek_parent (klass);
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_type_class_add_private (klass, sizeof (PublishingYouTubeYouTubeAuthorizerPrivate));
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	G_OBJECT_CLASS (klass)->finalize = publishing_you_tube_you_tube_authorizer_finalize;
+#line 1275 "YouTubePublishing.c"
+}
+
+
+static void publishing_you_tube_you_tube_authorizer_gdata_authorizer_interface_init (GDataAuthorizerInterface * iface) {
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	publishing_you_tube_you_tube_authorizer_gdata_authorizer_parent_iface = g_type_interface_peek_parent (iface);
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	iface->is_authorized_for_domain = (gboolean (*)(GDataAuthorizer*, GDataAuthorizationDomain*)) publishing_you_tube_you_tube_authorizer_real_is_authorized_for_domain;
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	iface->process_request = (void (*)(GDataAuthorizer*, GDataAuthorizationDomain*, SoupMessage*)) publishing_you_tube_you_tube_authorizer_real_process_request;
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	iface->refresh_authorization = (gboolean (*)(GDataAuthorizer*, GCancellable*, GError**)) publishing_you_tube_you_tube_authorizer_real_refresh_authorization;
+#line 1288 "YouTubePublishing.c"
+}
+
+
+static void publishing_you_tube_you_tube_authorizer_instance_init (PublishingYouTubeYouTubeAuthorizer * self) {
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	self->priv = PUBLISHING_YOU_TUBE_YOU_TUBE_AUTHORIZER_GET_PRIVATE (self);
+#line 1295 "YouTubePublishing.c"
+}
+
+
+static void publishing_you_tube_you_tube_authorizer_finalize (GObject* obj) {
+	PublishingYouTubeYouTubeAuthorizer * self;
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_AUTHORIZER, PublishingYouTubeYouTubeAuthorizer);
+#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_publishing_rest_support_session_unref0 (self->priv->session);
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (self->priv->authenticator);
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	G_OBJECT_CLASS (publishing_you_tube_you_tube_authorizer_parent_class)->finalize (obj);
+#line 1309 "YouTubePublishing.c"
+}
+
+
+GType publishing_you_tube_you_tube_authorizer_get_type (void) {
+	static volatile gsize publishing_you_tube_you_tube_authorizer_type_id__volatile = 0;
+	if (g_once_init_enter (&publishing_you_tube_you_tube_authorizer_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (PublishingYouTubeYouTubeAuthorizerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_you_tube_you_tube_authorizer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingYouTubeYouTubeAuthorizer), 0, (GInstanceInitFunc) publishing_you_tube_you_tube_authorizer_instance_init, NULL };
+		static const GInterfaceInfo gdata_authorizer_info = { (GInterfaceInitFunc) publishing_you_tube_you_tube_authorizer_gdata_authorizer_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
+		GType publishing_you_tube_you_tube_authorizer_type_id;
+		publishing_you_tube_you_tube_authorizer_type_id = g_type_register_static (G_TYPE_OBJECT, "PublishingYouTubeYouTubeAuthorizer", &g_define_type_info, 0);
+		g_type_add_interface_static (publishing_you_tube_you_tube_authorizer_type_id, gdata_authorizer_get_type (), &gdata_authorizer_info);
+		g_once_init_leave (&publishing_you_tube_you_tube_authorizer_type_id__volatile, publishing_you_tube_you_tube_authorizer_type_id);
+	}
+	return publishing_you_tube_you_tube_authorizer_type_id__volatile;
+}
+
+
 PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) {
 	PublishingYouTubeYouTubePublisher * self = NULL;
 	SpitPublishingService* _tmp0_ = NULL;
 	SpitPublishingPluginHost* _tmp1_ = NULL;
-	SpitPublishingPluginHost* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	PublishingYouTubePublishingParameters* _tmp4_ = NULL;
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	PublishingYouTubePublishingParameters* _tmp2_ = NULL;
+#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
 #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
+#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = service;
-#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1_ = host;
-#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = (PublishingYouTubeYouTubePublisher*) publishing_rest_support_google_publisher_construct (object_type, _tmp0_, _tmp1_, "https://gdata.youtube.com/");
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	self->priv->running = FALSE;
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp2_ = host;
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp3_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "refresh_token", NULL);
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (self->priv->refresh_token);
 #line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	self->priv->refresh_token = _tmp3_;
+	self->priv->running = FALSE;
 #line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp4_ = publishing_you_tube_publishing_parameters_new ();
+	_tmp2_ = publishing_you_tube_publishing_parameters_new ();
 #line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_you_tube_publishing_parameters_unref0 (self->priv->publishing_parameters);
 #line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	self->priv->publishing_parameters = _tmp4_;
+	self->priv->publishing_parameters = _tmp2_;
 #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
 #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1196,16 +1360,16 @@ PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_constr
 	self->priv->progress_reporter_target = NULL;
 #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self;
-#line 1180 "YouTubePublishing.c"
+#line 1366 "YouTubePublishing.c"
 }
 
 
 PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return publishing_you_tube_you_tube_publisher_construct (PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, service, host);
-#line 1187 "YouTubePublishing.c"
+#line 1373 "YouTubePublishing.c"
 }
 
 
@@ -1221,14 +1385,14 @@ static gboolean publishing_you_tube_you_tube_publisher_real_is_running (Publishi
 	result = _tmp0_;
 #line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 1203 "YouTubePublishing.c"
+#line 1389 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_you_tube_publisher_real_start (PublishingRESTSupportGooglePublisher* base) {
 	PublishingYouTubeYouTubePublisher * self;
 	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
+	SpitPublishingAuthenticator* _tmp1_ = NULL;
 #line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, PublishingYouTubeYouTubePublisher);
 #line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1239,25 +1403,15 @@ static void publishing_you_tube_you_tube_publisher_real_start (PublishingRESTSup
 	if (_tmp0_) {
 #line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 1221 "YouTubePublishing.c"
+#line 1407 "YouTubePublishing.c"
 	}
 #line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->running = TRUE;
 #line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp1_ = self->priv->refresh_token;
+	_tmp1_ = self->priv->authenticator;
 #line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	if (_tmp1_ == NULL) {
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		publishing_you_tube_you_tube_publisher_do_show_service_welcome_pane (self);
-#line 1231 "YouTubePublishing.c"
-	} else {
-		const gchar* _tmp2_ = NULL;
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp2_ = self->priv->refresh_token;
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		publishing_rest_support_google_publisher_start_oauth_flow (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher), _tmp2_);
-#line 1238 "YouTubePublishing.c"
-	}
+	spit_publishing_authenticator_authenticate (_tmp1_);
+#line 1415 "YouTubePublishing.c"
 }
 
 
@@ -1265,512 +1419,122 @@ static void publishing_you_tube_you_tube_publisher_real_stop (PublishingRESTSupp
 	PublishingYouTubeYouTubePublisher * self;
 	PublishingRESTSupportGoogleSession* _tmp0_ = NULL;
 	PublishingRESTSupportGoogleSession* _tmp1_ = NULL;
-#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, PublishingYouTubeYouTubePublisher);
-#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_debug ("YouTubePublishing.vala:155: YouTubePublisher: stopped.");
-#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_debug ("YouTubePublishing.vala:152: YouTubePublisher: stopped.");
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->running = FALSE;
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = publishing_rest_support_google_publisher_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1_ = _tmp0_;
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_rest_support_session_stop_transactions (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_rest_support_session_unref0 (_tmp1_);
-#line 1261 "YouTubePublishing.c"
-}
-
-
-static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper (PublishingYouTubeYouTubePublisher* self, xmlNode* document_root, GError** error) {
-	gchar* result = NULL;
-	gchar* _result_ = NULL;
-	gchar* _tmp0_ = NULL;
-	xmlNode* doc_node_iter = NULL;
-	xmlNode* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp34_ = NULL;
-	GError * _inner_error_ = NULL;
-#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_return_val_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self), NULL);
-#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp0_ = g_strdup ("");
-#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_result_ = _tmp0_;
-#line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	doc_node_iter = NULL;
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp1_ = document_root;
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp2_ = _tmp1_->name;
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	if (g_strcmp0 (_tmp2_, "feed") == 0) {
-#line 1288 "YouTubePublishing.c"
-		xmlNode* _tmp3_ = NULL;
-		xmlNode* _tmp4_ = NULL;
-#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp3_ = document_root;
-#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp4_ = _tmp3_->children;
-#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		doc_node_iter = _tmp4_;
-#line 1297 "YouTubePublishing.c"
-	} else {
-		xmlNode* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp5_ = document_root;
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp6_ = _tmp5_->name;
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		if (g_strcmp0 (_tmp6_, "entry") == 0) {
-#line 1307 "YouTubePublishing.c"
-			xmlNode* _tmp7_ = NULL;
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_tmp7_ = document_root;
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			doc_node_iter = _tmp7_;
-#line 1313 "YouTubePublishing.c"
-		} else {
-			GError* _tmp8_ = NULL;
-#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_tmp8_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "response root node isn't a <feed> or <entry>");
-#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_inner_error_ = _tmp8_;
-#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				g_propagate_error (error, _inner_error_);
-#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				_g_free0 (_result_);
-#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				return NULL;
-#line 1328 "YouTubePublishing.c"
-			} else {
-#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				_g_free0 (_result_);
-#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.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 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				g_clear_error (&_inner_error_);
-#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				return NULL;
-#line 1338 "YouTubePublishing.c"
-			}
-		}
-	}
-	{
-		gboolean _tmp9_ = FALSE;
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp9_ = TRUE;
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		while (TRUE) {
-#line 1348 "YouTubePublishing.c"
-			xmlNode* _tmp12_ = NULL;
-			xmlNode* _tmp13_ = NULL;
-			const gchar* _tmp14_ = NULL;
-			gchar* name_val = NULL;
-			gchar* url_val = NULL;
-			xmlNode* channel_node_iter = NULL;
-			xmlNode* _tmp15_ = NULL;
-			xmlNode* _tmp16_ = NULL;
-			const gchar* _tmp32_ = NULL;
-			gchar* _tmp33_ = NULL;
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			if (!_tmp9_) {
-#line 1361 "YouTubePublishing.c"
-				xmlNode* _tmp10_ = NULL;
-				xmlNode* _tmp11_ = NULL;
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				_tmp10_ = doc_node_iter;
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				_tmp11_ = _tmp10_->next;
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				doc_node_iter = _tmp11_;
-#line 1370 "YouTubePublishing.c"
-			}
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_tmp9_ = FALSE;
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_tmp12_ = doc_node_iter;
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			if (!(_tmp12_ != NULL)) {
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				break;
-#line 1380 "YouTubePublishing.c"
-			}
-#line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_tmp13_ = doc_node_iter;
-#line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_tmp14_ = _tmp13_->name;
-#line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			if (g_strcmp0 (_tmp14_, "entry") != 0) {
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				continue;
-#line 1390 "YouTubePublishing.c"
-			}
-#line 179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			name_val = NULL;
-#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			url_val = NULL;
-#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_tmp15_ = doc_node_iter;
-#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_tmp16_ = _tmp15_->children;
-#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			channel_node_iter = _tmp16_;
-#line 1402 "YouTubePublishing.c"
-			{
-				gboolean _tmp17_ = FALSE;
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				_tmp17_ = TRUE;
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				while (TRUE) {
-#line 1409 "YouTubePublishing.c"
-					xmlNode* _tmp20_ = NULL;
-					xmlNode* _tmp21_ = NULL;
-					const gchar* _tmp22_ = NULL;
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-					if (!_tmp17_) {
-#line 1415 "YouTubePublishing.c"
-						xmlNode* _tmp18_ = NULL;
-						xmlNode* _tmp19_ = NULL;
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-						_tmp18_ = channel_node_iter;
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-						_tmp19_ = _tmp18_->next;
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-						channel_node_iter = _tmp19_;
-#line 1424 "YouTubePublishing.c"
-					}
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-					_tmp17_ = FALSE;
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-					_tmp20_ = channel_node_iter;
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-					if (!(_tmp20_ != NULL)) {
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-						break;
-#line 1434 "YouTubePublishing.c"
-					}
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-					_tmp21_ = channel_node_iter;
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-					_tmp22_ = _tmp21_->name;
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-					if (g_strcmp0 (_tmp22_, "title") == 0) {
-#line 1442 "YouTubePublishing.c"
-						xmlNode* _tmp23_ = NULL;
-						gchar* _tmp24_ = NULL;
-#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-						_tmp23_ = channel_node_iter;
-#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-						_tmp24_ = (gchar*) xmlNodeGetContent (_tmp23_);
-#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-						_g_free0 (name_val);
-#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-						name_val = _tmp24_;
-#line 1453 "YouTubePublishing.c"
-					} else {
-						xmlNode* _tmp25_ = NULL;
-						const gchar* _tmp26_ = NULL;
-#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-						_tmp25_ = channel_node_iter;
-#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-						_tmp26_ = _tmp25_->name;
-#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-						if (g_strcmp0 (_tmp26_, "id") == 0) {
-#line 1463 "YouTubePublishing.c"
-							xmlNode* _tmp27_ = NULL;
-							xmlNs* _tmp28_ = NULL;
-							const gchar* _tmp29_ = NULL;
-							xmlNode* _tmp30_ = NULL;
-							gchar* _tmp31_ = NULL;
-#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-							_tmp27_ = channel_node_iter;
-#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-							_tmp28_ = _tmp27_->ns;
-#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-							_tmp29_ = _tmp28_->prefix;
-#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-							if (_tmp29_ != NULL) {
-#line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-								continue;
-#line 1479 "YouTubePublishing.c"
-							}
-#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-							_tmp30_ = channel_node_iter;
-#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-							_tmp31_ = (gchar*) xmlNodeGetContent (_tmp30_);
-#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-							_g_free0 (url_val);
-#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-							url_val = _tmp31_;
-#line 1489 "YouTubePublishing.c"
-						}
-					}
-				}
-			}
-#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_tmp32_ = name_val;
-#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_tmp33_ = g_strdup (_tmp32_);
-#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (_result_);
-#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_result_ = _tmp33_;
-#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (url_val);
-#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (name_val);
-#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			break;
-#line 1508 "YouTubePublishing.c"
-		}
-	}
-#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp34_ = _result_;
-#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_debug ("YouTubePublishing.vala:199: YouTubePublisher: extracted channel name '" \
-"%s' from response XML.", _tmp34_);
-#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	result = _result_;
-#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	return result;
-#line 1519 "YouTubePublishing.c"
-}
-
-
-static void publishing_you_tube_you_tube_publisher_on_service_welcome_login (PublishingYouTubeYouTubePublisher* self) {
-	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
-#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
-#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_debug ("YouTubePublishing.vala:205: EVENT: user clicked 'Login' in welcome pan" \
-"e.");
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp0_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	if (!_tmp0_) {
-#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		return;
-#line 1536 "YouTubePublishing.c"
-	}
-#line 210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp1_ = self->priv->refresh_token;
-#line 210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	publishing_rest_support_google_publisher_start_oauth_flow (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher), _tmp1_);
-#line 1542 "YouTubePublishing.c"
+#line 1437 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_you_tube_publisher_real_on_login_flow_complete (PublishingRESTSupportGooglePublisher* base) {
 	PublishingYouTubeYouTubePublisher * self;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
+	PublishingYouTubePublishingParameters* _tmp0_ = NULL;
 	PublishingRESTSupportGoogleSession* _tmp1_ = NULL;
 	PublishingRESTSupportGoogleSession* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	gchar* _tmp4_ = NULL;
-	PublishingYouTubePublishingParameters* _tmp5_ = NULL;
+	PublishingRESTSupportGoogleSession* _tmp5_ = NULL;
 	PublishingRESTSupportGoogleSession* _tmp6_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-#line 213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	SpitPublishingAuthenticator* _tmp7_ = NULL;
+	PublishingYouTubeYouTubeAuthorizer* _tmp8_ = NULL;
+	PublishingYouTubeYouTubeAuthorizer* _tmp9_ = NULL;
+	GDataYouTubeService* _tmp10_ = NULL;
+#line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, PublishingYouTubeYouTubePublisher);
-#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_debug ("YouTubePublishing.vala:214: EVENT: OAuth login flow complete.");
-#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp0_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_debug ("YouTubePublishing.vala:160: EVENT: OAuth login flow complete.");
+#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp0_ = self->priv->publishing_parameters;
+#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1_ = publishing_rest_support_google_publisher_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp2_ = _tmp1_;
-#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp3_ = publishing_rest_support_google_session_get_refresh_token (_tmp2_);
-#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp3_ = publishing_rest_support_google_session_get_user_name (_tmp2_);
+#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp4_ = _tmp3_;
-#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "refresh_token", _tmp4_);
-#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	publishing_you_tube_publishing_parameters_set_user_name (_tmp0_, _tmp4_);
+#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_free0 (_tmp4_);
-#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_rest_support_session_unref0 (_tmp2_);
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp5_ = self->priv->publishing_parameters;
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp6_ = publishing_rest_support_google_publisher_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp7_ = _tmp6_;
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp8_ = publishing_rest_support_google_session_get_user_name (_tmp7_);
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp9_ = _tmp8_;
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	publishing_you_tube_publishing_parameters_set_user_name (_tmp5_, _tmp9_);
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (_tmp9_);
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_publishing_rest_support_session_unref0 (_tmp7_);
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	publishing_you_tube_you_tube_publisher_do_fetch_account_information (self);
-#line 1596 "YouTubePublishing.c"
-}
-
-
-static void _publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_complete ((PublishingYouTubeYouTubePublisher*) self, _sender);
-#line 1603 "YouTubePublishing.c"
-}
-
-
-static void _publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_error ((PublishingYouTubeYouTubePublisher*) self, _sender, err);
-#line 1610 "YouTubePublishing.c"
-}
-
-
-static void publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_complete (PublishingYouTubeYouTubePublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	PublishingRESTSupportTransaction* _tmp5_ = NULL;
-#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
-#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp0_ = txn;
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_complete_publishing_rest_support_transaction_completed, self);
-#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp2_ = txn;
-#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_error_publishing_rest_support_transaction_network_error, self);
-#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_debug ("YouTubePublishing.vala:227: EVENT: finished fetching account and chann" \
-"el information.");
-#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp4_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	if (!_tmp4_) {
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		return;
-#line 1645 "YouTubePublishing.c"
-	}
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp5_ = txn;
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	publishing_you_tube_you_tube_publisher_do_parse_and_display_account_information (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_TYPE_CHANNEL_DIRECTORY_TRANSACTION, PublishingYouTubeYouTubePublisherChannelDirectoryTransaction));
-#line 1651 "YouTubePublishing.c"
-}
-
-
-static void publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_error (PublishingYouTubeYouTubePublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	PublishingRESTSupportTransaction* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
-	SpitPublishingPluginHost* _tmp8_ = NULL;
-	GError* _tmp9_ = NULL;
-#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
-#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn));
-#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp0_ = bad_txn;
-#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_complete_publishing_rest_support_transaction_completed, self);
-#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp2_ = bad_txn;
-#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_error_publishing_rest_support_transaction_network_error, self);
-#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp4_ = bad_txn;
-#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
-#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp5_ = publishing_rest_support_google_publisher_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp6_ = _tmp5_;
-#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_debug ("YouTubePublishing.vala:240: EVENT: fetching account and channel inform" \
-"ation failed; response = '%s'.", _tmp6_);
-#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (_tmp6_);
-#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp7_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	if (!_tmp7_) {
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		return;
-#line 1698 "YouTubePublishing.c"
-	}
-#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp8_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp9_ = err;
-#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	spit_publishing_plugin_host_post_error (_tmp8_, _tmp9_);
-#line 1706 "YouTubePublishing.c"
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp7_ = self->priv->authenticator;
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp8_ = publishing_you_tube_you_tube_authorizer_new (_tmp6_, _tmp7_);
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp9_ = _tmp8_;
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp10_ = gdata_youtube_service_new (PUBLISHING_YOU_TUBE_DEVELOPER_KEY, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gdata_authorizer_get_type (), GDataAuthorizer));
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (self->priv->youtube_service);
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	self->priv->youtube_service = _tmp10_;
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (_tmp9_);
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_publishing_rest_support_session_unref0 (_tmp6_);
+#line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	publishing_you_tube_you_tube_publisher_do_show_publishing_options_pane (self);
+#line 1496 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_you_tube_publisher_on_publishing_options_logout (PublishingYouTubeYouTubePublisher* self) {
 	gboolean _tmp0_ = FALSE;
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
-#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_debug ("YouTubePublishing.vala:250: EVENT: user clicked 'Logout' in the publis" \
+#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_debug ("YouTubePublishing.vala:170: EVENT: user clicked 'Logout' in the publis" \
 "hing options pane.");
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (!_tmp0_) {
-#line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 1722 "YouTubePublishing.c"
+#line 1512 "YouTubePublishing.c"
 	}
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_rest_support_google_publisher_do_logout (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 1726 "YouTubePublishing.c"
+#line 1516 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_you_tube_publisher_on_publishing_options_publish (PublishingYouTubeYouTubePublisher* self) {
 	gboolean _tmp0_ = FALSE;
-#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
-#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_debug ("YouTubePublishing.vala:259: EVENT: user clicked 'Publish' in the publi" \
+#line 179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_debug ("YouTubePublishing.vala:179: EVENT: user clicked 'Publish' in the publi" \
 "shing options pane.");
-#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (!_tmp0_) {
-#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 1742 "YouTubePublishing.c"
+#line 1532 "YouTubePublishing.c"
 	}
-#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_do_upload (self);
-#line 1746 "YouTubePublishing.c"
+#line 1536 "YouTubePublishing.c"
 }
 
 
@@ -1783,52 +1547,52 @@ static void publishing_you_tube_you_tube_publisher_on_upload_status_updated (Pub
 	void* _tmp3__target = NULL;
 	gint _tmp4_ = 0;
 	gdouble _tmp5_ = 0.0;
-#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
-#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = completed_fraction;
-#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_debug ("YouTubePublishing.vala:268: EVENT: uploader reports upload %.2f percen" \
+#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_debug ("YouTubePublishing.vala:188: EVENT: uploader reports upload %.2f percen" \
 "t complete.", 100.0 * _tmp0_);
-#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1_ = self->priv->progress_reporter;
-#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1__target = self->priv->progress_reporter_target;
-#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_vala_assert (_tmp1_ != NULL, "progress_reporter != null");
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp2_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (!_tmp2_) {
-#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 1777 "YouTubePublishing.c"
+#line 1567 "YouTubePublishing.c"
 	}
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp3_ = self->priv->progress_reporter;
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp3__target = self->priv->progress_reporter_target;
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp4_ = file_number;
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp5_ = completed_fraction;
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 1789 "YouTubePublishing.c"
+#line 1579 "YouTubePublishing.c"
 }
 
 
 static void _publishing_you_tube_you_tube_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) {
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_on_upload_complete ((PublishingYouTubeYouTubePublisher*) self, _sender, num_photos_published);
-#line 1796 "YouTubePublishing.c"
+#line 1586 "YouTubePublishing.c"
 }
 
 
 static void _publishing_you_tube_you_tube_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) {
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_on_upload_error ((PublishingYouTubeYouTubePublisher*) self, _sender, err);
-#line 1803 "YouTubePublishing.c"
+#line 1593 "YouTubePublishing.c"
 }
 
 
@@ -1839,38 +1603,38 @@ static void publishing_you_tube_you_tube_publisher_on_upload_complete (Publishin
 	guint _tmp3_ = 0U;
 	gint _tmp4_ = 0;
 	gboolean _tmp5_ = FALSE;
-#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
-#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = uploader;
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_you_tube_you_tube_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp2_ = uploader;
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_you_tube_you_tube_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
-#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp4_ = num_published;
-#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_debug ("YouTubePublishing.vala:283: EVENT: uploader reports upload complete; %" \
+#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_debug ("YouTubePublishing.vala:203: EVENT: uploader reports upload complete; %" \
 "d items published.", _tmp4_);
-#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp5_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (!_tmp5_) {
-#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 1840 "YouTubePublishing.c"
+#line 1630 "YouTubePublishing.c"
 	}
-#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_do_show_success_pane (self);
-#line 1844 "YouTubePublishing.c"
+#line 1634 "YouTubePublishing.c"
 }
 
 
@@ -1884,366 +1648,58 @@ static void publishing_you_tube_you_tube_publisher_on_upload_error (PublishingYo
 	const gchar* _tmp6_ = NULL;
 	SpitPublishingPluginHost* _tmp7_ = NULL;
 	GError* _tmp8_ = NULL;
-#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
-#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
-#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = uploader;
-#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
-#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_you_tube_you_tube_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
-#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp2_ = uploader;
-#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
-#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_you_tube_you_tube_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
-#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp4_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (!_tmp4_) {
-#line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 1880 "YouTubePublishing.c"
+#line 1670 "YouTubePublishing.c"
 	}
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp5_ = err;
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp6_ = _tmp5_->message;
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_debug ("YouTubePublishing.vala:299: EVENT: uploader reports upload error = '%s" \
+#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_debug ("YouTubePublishing.vala:219: EVENT: uploader reports upload error = '%s" \
 "'.", _tmp6_);
-#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp7_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp8_ = err;
-#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 1894 "YouTubePublishing.c"
-}
-
-
-static void _publishing_you_tube_you_tube_publisher_on_service_welcome_login_spit_publishing_login_callback (gpointer self) {
-#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	publishing_you_tube_you_tube_publisher_on_service_welcome_login ((PublishingYouTubeYouTubePublisher*) self);
-#line 1901 "YouTubePublishing.c"
-}
-
-
-static void publishing_you_tube_you_tube_publisher_do_show_service_welcome_pane (PublishingYouTubeYouTubePublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_debug ("YouTubePublishing.vala:305: ACTION: showing service welcome pane.");
-#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp0_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	spit_publishing_plugin_host_install_welcome_pane (_tmp0_, PUBLISHING_YOU_TUBE_SERVICE_WELCOME_MESSAGE, _publishing_you_tube_you_tube_publisher_on_service_welcome_login_spit_publishing_login_callback, self);
-#line 1915 "YouTubePublishing.c"
-}
-
-
-static void publishing_you_tube_you_tube_publisher_do_fetch_account_information (PublishingYouTubeYouTubePublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	PublishingYouTubeYouTubePublisherChannelDirectoryTransaction* directory_trans = NULL;
-	PublishingRESTSupportGoogleSession* _tmp2_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp3_ = NULL;
-	PublishingYouTubeYouTubePublisherChannelDirectoryTransaction* _tmp4_ = NULL;
-	PublishingYouTubeYouTubePublisherChannelDirectoryTransaction* _tmp5_ = NULL;
-	GError * _inner_error_ = NULL;
-#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_debug ("YouTubePublishing.vala:311: ACTION: fetching channel information.");
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp0_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	spit_publishing_plugin_host_install_account_fetch_wait_pane (_tmp0_);
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp1_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp1_, TRUE);
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp2_ = publishing_rest_support_google_publisher_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp3_ = _tmp2_;
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp4_ = publishing_you_tube_you_tube_publisher_channel_directory_transaction_new (_tmp3_);
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp5_ = _tmp4_;
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_publishing_rest_support_session_unref0 (_tmp3_);
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	directory_trans = _tmp5_;
-#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 1956 "YouTubePublishing.c"
-	{
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 1964 "YouTubePublishing.c"
-				goto __catch27_spit_publishing_publishing_error;
-			}
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_publishing_rest_support_transaction_unref0 (directory_trans);
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.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 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			g_clear_error (&_inner_error_);
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			return;
-#line 1975 "YouTubePublishing.c"
-		}
-	}
-	goto __finally27;
-	__catch27_spit_publishing_publishing_error:
-	{
-		GError* err = NULL;
-		GError* _tmp6_ = NULL;
-#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		err = _inner_error_;
-#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_inner_error_ = NULL;
-#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp6_ = err;
-#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_error (self, G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp6_);
-#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_g_error_free0 (err);
-#line 1993 "YouTubePublishing.c"
-	}
-	__finally27:
-#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_publishing_rest_support_transaction_unref0 (directory_trans);
-#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.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 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		g_clear_error (&_inner_error_);
-#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		return;
-#line 2006 "YouTubePublishing.c"
-	}
-#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_publishing_rest_support_transaction_unref0 (directory_trans);
-#line 2010 "YouTubePublishing.c"
-}
-
-
-static gchar* _publishing_you_tube_you_tube_publisher_channel_directory_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self) {
-	gchar* result;
-	result = publishing_you_tube_you_tube_publisher_channel_directory_transaction_validate_xml (doc);
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	return result;
-#line 2019 "YouTubePublishing.c"
-}
-
-
-static void publishing_you_tube_you_tube_publisher_do_parse_and_display_account_information (PublishingYouTubeYouTubePublisher* self, PublishingYouTubeYouTubePublisherChannelDirectoryTransaction* transaction) {
-	PublishingRESTSupportXmlDocument* response_doc = NULL;
-	GError * _inner_error_ = NULL;
-#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
-#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_return_if_fail (PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_IS_CHANNEL_DIRECTORY_TRANSACTION (transaction));
-#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_debug ("YouTubePublishing.vala:329: ACTION: extracting account and channel inf" \
-"ormation from body of server response");
-#line 2032 "YouTubePublishing.c"
-	{
-		PublishingRESTSupportXmlDocument* _tmp0_ = NULL;
-		PublishingYouTubeYouTubePublisherChannelDirectoryTransaction* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp4_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp5_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp6_ = NULL;
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp1_ = transaction;
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp2_ = publishing_rest_support_transaction_get_response (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp3_ = _tmp2_;
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp4_ = publishing_rest_support_xml_document_parse_string (_tmp3_, _publishing_you_tube_you_tube_publisher_channel_directory_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp5_ = _tmp4_;
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_g_free0 (_tmp3_);
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp0_ = _tmp5_;
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2059 "YouTubePublishing.c"
-				goto __catch28_spit_publishing_publishing_error;
-			}
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.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 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			g_clear_error (&_inner_error_);
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			return;
-#line 2070 "YouTubePublishing.c"
-		}
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp6_ = _tmp0_;
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp0_ = NULL;
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		response_doc = _tmp6_;
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_publishing_rest_support_xml_document_unref0 (_tmp0_);
-#line 2082 "YouTubePublishing.c"
-	}
-	goto __finally28;
-	__catch28_spit_publishing_publishing_error:
-	{
-		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp7_ = NULL;
-		GError* _tmp8_ = NULL;
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		err = _inner_error_;
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_inner_error_ = NULL;
-#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp7_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp8_ = err;
-#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_g_error_free0 (err);
-#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		return;
-#line 2106 "YouTubePublishing.c"
-	}
-	__finally28:
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.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 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		g_clear_error (&_inner_error_);
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		return;
-#line 2119 "YouTubePublishing.c"
-	}
-	{
-		gchar* _tmp9_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp10_ = NULL;
-		xmlNode* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		PublishingYouTubePublishingParameters* _tmp13_ = NULL;
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp10_ = response_doc;
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp11_ = publishing_rest_support_xml_document_get_root_node (_tmp10_);
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp12_ = publishing_you_tube_you_tube_publisher_extract_channel_name_helper (self, _tmp11_, &_inner_error_);
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp9_ = _tmp12_;
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2139 "YouTubePublishing.c"
-				goto __catch29_spit_publishing_publishing_error;
-			}
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.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 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			g_clear_error (&_inner_error_);
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			return;
-#line 2150 "YouTubePublishing.c"
-		}
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp13_ = self->priv->publishing_parameters;
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		publishing_you_tube_publishing_parameters_set_channel_name (_tmp13_, _tmp9_);
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_g_free0 (_tmp9_);
-#line 2158 "YouTubePublishing.c"
-	}
-	goto __finally29;
-	__catch29_spit_publishing_publishing_error:
-	{
-		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp14_ = NULL;
-		GError* _tmp15_ = NULL;
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		err = _inner_error_;
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_inner_error_ = NULL;
-#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp14_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp15_ = err;
-#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp14_, _tmp15_);
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_g_error_free0 (err);
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		return;
-#line 2182 "YouTubePublishing.c"
-	}
-	__finally29:
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.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 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		g_clear_error (&_inner_error_);
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		return;
-#line 2195 "YouTubePublishing.c"
-	}
-#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	publishing_you_tube_you_tube_publisher_do_show_publishing_options_pane (self);
-#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 2201 "YouTubePublishing.c"
+#line 1684 "YouTubePublishing.c"
 }
 
 
 static void _publishing_you_tube_you_tube_publisher_on_publishing_options_publish_publishing_you_tube_publishing_options_pane_publish (PublishingYouTubePublishingOptionsPane* _sender, gpointer self) {
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_on_publishing_options_publish ((PublishingYouTubeYouTubePublisher*) self);
-#line 2208 "YouTubePublishing.c"
+#line 1691 "YouTubePublishing.c"
 }
 
 
 static void _publishing_you_tube_you_tube_publisher_on_publishing_options_logout_publishing_you_tube_publishing_options_pane_logout (PublishingYouTubePublishingOptionsPane* _sender, gpointer self) {
-#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_on_publishing_options_logout ((PublishingYouTubeYouTubePublisher*) self);
-#line 2215 "YouTubePublishing.c"
+#line 1698 "YouTubePublishing.c"
 }
 
 
@@ -2251,39 +1707,40 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa
 	GtkBuilder* builder = NULL;
 	GtkBuilder* _tmp0_ = NULL;
 	PublishingYouTubePublishingOptionsPane* opts_pane = NULL;
-	SpitPublishingPluginHost* _tmp8_ = NULL;
-	GtkBuilder* _tmp9_ = NULL;
-	PublishingYouTubePublishingParameters* _tmp10_ = NULL;
-	PublishingYouTubePublishingOptionsPane* _tmp11_ = NULL;
+	SpitPublishingAuthenticator* _tmp8_ = NULL;
+	SpitPublishingPluginHost* _tmp9_ = NULL;
+	GtkBuilder* _tmp10_ = NULL;
+	PublishingYouTubePublishingParameters* _tmp11_ = NULL;
 	PublishingYouTubePublishingOptionsPane* _tmp12_ = NULL;
 	PublishingYouTubePublishingOptionsPane* _tmp13_ = NULL;
-	SpitPublishingPluginHost* _tmp14_ = NULL;
-	PublishingYouTubePublishingOptionsPane* _tmp15_ = NULL;
-	SpitPublishingPluginHost* _tmp16_ = NULL;
+	PublishingYouTubePublishingOptionsPane* _tmp14_ = NULL;
+	SpitPublishingPluginHost* _tmp15_ = NULL;
+	PublishingYouTubePublishingOptionsPane* _tmp16_ = NULL;
+	SpitPublishingPluginHost* _tmp17_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
-#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_debug ("YouTubePublishing.vala:352: ACTION: showing publishing options pane.");
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_debug ("YouTubePublishing.vala:225: ACTION: showing publishing options pane.");
+#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = gtk_builder_new ();
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	builder = _tmp0_;
-#line 2241 "YouTubePublishing.c"
+#line 1725 "YouTubePublishing.c"
 	{
 		GtkBuilder* _tmp1_ = NULL;
-#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp1_ = builder;
-#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		gtk_builder_add_from_resource (_tmp1_, PLUGIN_RESOURCE_PATH "/youtube_publishing_options_pane.ui", &_inner_error_);
-#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2250 "YouTubePublishing.c"
-			goto __catch30_g_error;
+#line 1734 "YouTubePublishing.c"
+			goto __catch20_g_error;
 		}
 	}
-	goto __finally30;
-	__catch30_g_error:
+	goto __finally20;
+	__catch20_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp2_ = NULL;
@@ -2292,90 +1749,92 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa
 		const gchar* _tmp5_ = NULL;
 		GError* _tmp6_ = NULL;
 		GError* _tmp7_ = NULL;
-#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		e = _inner_error_;
-#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_inner_error_ = NULL;
-#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp2_ = e;
-#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp3_ = _tmp2_->message;
-#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		g_warning ("YouTubePublishing.vala:360: Could not parse UI file! Error: %s.", _tmp3_);
-#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		g_warning ("YouTubePublishing.vala:233: Could not parse UI file! Error: %s.", _tmp3_);
+#line 234 "/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"
+#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_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"
+#line 234 "/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"
+#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp7_ = _tmp6_;
-#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp4_, _tmp7_);
-#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_g_error_free0 (_tmp7_);
-#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_g_error_free0 (e);
-#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_g_object_unref0 (builder);
-#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 2292 "YouTubePublishing.c"
+#line 1776 "YouTubePublishing.c"
 	}
-	__finally30:
-#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	__finally20:
+#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_g_object_unref0 (builder);
-#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.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 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 2305 "YouTubePublishing.c"
+#line 1789 "YouTubePublishing.c"
 	}
-#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp8_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp9_ = builder;
-#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp10_ = self->priv->publishing_parameters;
-#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp11_ = publishing_you_tube_publishing_options_pane_new (_tmp8_, _tmp9_, _tmp10_);
-#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	opts_pane = _tmp11_;
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp12_ = opts_pane;
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_connect_object (_tmp12_, "publish", (GCallback) _publishing_you_tube_you_tube_publisher_on_publishing_options_publish_publishing_you_tube_publishing_options_pane_publish, self, 0);
-#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp8_ = self->priv->authenticator;
+#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp9_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp10_ = builder;
+#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp11_ = self->priv->publishing_parameters;
+#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp12_ = publishing_you_tube_publishing_options_pane_new (_tmp8_, _tmp9_, _tmp10_, _tmp11_);
+#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	opts_pane = _tmp12_;
+#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp13_ = opts_pane;
-#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_connect_object (_tmp13_, "logout", (GCallback) _publishing_you_tube_you_tube_publisher_on_publishing_options_logout_publishing_you_tube_publishing_options_pane_logout, self, 0);
-#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp14_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp15_ = opts_pane;
-#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	spit_publishing_plugin_host_install_dialog_pane (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp16_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp16_, FALSE);
-#line 351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_signal_connect_object (_tmp13_, "publish", (GCallback) _publishing_you_tube_you_tube_publisher_on_publishing_options_publish_publishing_you_tube_publishing_options_pane_publish, self, 0);
+#line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp14_ = opts_pane;
+#line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_signal_connect_object (_tmp14_, "logout", (GCallback) _publishing_you_tube_you_tube_publisher_on_publishing_options_logout_publishing_you_tube_publishing_options_pane_logout, self, 0);
+#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp15_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp16_ = opts_pane;
+#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	spit_publishing_plugin_host_install_dialog_pane (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+#line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp17_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+#line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	spit_publishing_plugin_host_set_service_locked (_tmp17_, FALSE);
+#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (opts_pane);
-#line 351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (builder);
-#line 2339 "YouTubePublishing.c"
+#line 1825 "YouTubePublishing.c"
 }
 
 
 static void _publishing_you_tube_you_tube_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
-#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_on_upload_status_updated ((PublishingYouTubeYouTubePublisher*) self, file_number, fraction_complete);
-#line 2346 "YouTubePublishing.c"
+#line 1832 "YouTubePublishing.c"
 }
 
 
@@ -2394,301 +1853,251 @@ static void publishing_you_tube_you_tube_publisher_do_upload (PublishingYouTubeY
 	gint publishables_length1 = 0;
 	gint _publishables_size_ = 0;
 	PublishingYouTubeUploader* uploader = NULL;
-	PublishingRESTSupportGoogleSession* _tmp10_ = NULL;
+	GDataYouTubeService* _tmp10_ = NULL;
 	PublishingRESTSupportGoogleSession* _tmp11_ = NULL;
-	SpitPublishingPublishable** _tmp12_ = NULL;
-	gint _tmp12__length1 = 0;
-	PublishingYouTubePublishingParameters* _tmp13_ = NULL;
-	PublishingYouTubeUploader* _tmp14_ = NULL;
+	PublishingRESTSupportGoogleSession* _tmp12_ = NULL;
+	SpitPublishingPublishable** _tmp13_ = NULL;
+	gint _tmp13__length1 = 0;
+	PublishingYouTubePublishingParameters* _tmp14_ = NULL;
 	PublishingYouTubeUploader* _tmp15_ = NULL;
 	PublishingYouTubeUploader* _tmp16_ = NULL;
 	PublishingYouTubeUploader* _tmp17_ = NULL;
 	PublishingYouTubeUploader* _tmp18_ = NULL;
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	PublishingYouTubeUploader* _tmp19_ = NULL;
+#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
-#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_debug ("YouTubePublishing.vala:377: ACTION: uploading media items to remote se" \
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_debug ("YouTubePublishing.vala:249: ACTION: uploading media items to remote se" \
 "rver.");
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = 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/YouTubePublishing.vala"
+#line 251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	spit_publishing_plugin_host_install_account_fetch_wait_pane (_tmp1_);
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp2_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp5_ = spit_publishing_plugin_host_serialize_publishables (_tmp2_, -1, FALSE, &_tmp3_, &_tmp4_);
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->progress_reporter = NULL;
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->progress_reporter_target = NULL;
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->progress_reporter = _tmp5_;
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->progress_reporter_target = _tmp3_;
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = _tmp4_;
-#line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp6_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (!_tmp6_) {
-#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 2411 "YouTubePublishing.c"
+#line 1898 "YouTubePublishing.c"
 	}
-#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp7_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp9_ = spit_publishing_plugin_host_get_publishables (_tmp7_, &_tmp8_);
-#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishables = _tmp9_;
-#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishables_length1 = _tmp8_;
-#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishables_size_ = publishables_length1;
-#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp10_ = publishing_rest_support_google_publisher_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp11_ = _tmp10_;
-#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp12_ = publishables;
-#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp12__length1 = publishables_length1;
-#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp13_ = self->priv->publishing_parameters;
-#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp14_ = publishing_you_tube_uploader_new (_tmp11_, _tmp12_, _tmp12__length1, _tmp13_);
-#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp15_ = _tmp14_;
-#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_publishing_rest_support_session_unref0 (_tmp11_);
-#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	uploader = _tmp15_;
-#line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp16_ = uploader;
-#line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-complete", (GCallback) _publishing_you_tube_you_tube_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self, 0);
-#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp10_ = self->priv->youtube_service;
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp11_ = publishing_rest_support_google_publisher_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp12_ = _tmp11_;
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp13_ = publishables;
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp13__length1 = publishables_length1;
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp14_ = self->priv->publishing_parameters;
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp15_ = publishing_you_tube_uploader_new (_tmp10_, _tmp12_, _tmp13_, _tmp13__length1, _tmp14_);
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp16_ = _tmp15_;
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_publishing_rest_support_session_unref0 (_tmp12_);
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	uploader = _tmp16_;
+#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp17_ = uploader;
-#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-error", (GCallback) _publishing_you_tube_you_tube_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self, 0);
-#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-complete", (GCallback) _publishing_you_tube_you_tube_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self, 0);
+#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp18_ = uploader;
-#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	publishing_rest_support_batch_uploader_upload (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), _publishing_you_tube_you_tube_publisher_on_upload_status_updated_spit_publishing_progress_callback, self);
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-error", (GCallback) _publishing_you_tube_you_tube_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self, 0);
+#line 269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp19_ = uploader;
+#line 269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	publishing_rest_support_batch_uploader_upload (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), _publishing_you_tube_you_tube_publisher_on_upload_status_updated_spit_publishing_progress_callback, self);
+#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_rest_support_batch_uploader_unref0 (uploader);
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 2457 "YouTubePublishing.c"
+#line 1946 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_you_tube_publisher_do_show_success_pane (PublishingYouTubeYouTubePublisher* self) {
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	SpitPublishingPluginHost* _tmp1_ = NULL;
-#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
-#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_debug ("YouTubePublishing.vala:402: ACTION: showing success pane.");
-#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_debug ("YouTubePublishing.vala:273: ACTION: showing success pane.");
+#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
-#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	spit_publishing_plugin_host_install_success_pane (_tmp1_);
-#line 2476 "YouTubePublishing.c"
+#line 1965 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_you_tube_publisher_real_do_logout (PublishingRESTSupportGooglePublisher* base) {
 	PublishingYouTubeYouTubePublisher * self;
-	PublishingRESTSupportGoogleSession* _tmp0_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp1_ = NULL;
-	SpitPublishingPluginHost* _tmp2_ = NULL;
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	SpitPublishingAuthenticator* _tmp0_ = NULL;
+	gboolean _tmp1_ = FALSE;
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, PublishingYouTubeYouTubePublisher);
-#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_debug ("YouTubePublishing.vala:409: ACTION: logging out user.");
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp0_ = publishing_rest_support_google_publisher_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp1_ = _tmp0_;
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	publishing_rest_support_google_session_deauthenticate (_tmp1_);
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_publishing_rest_support_session_unref0 (_tmp1_);
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (self->priv->refresh_token);
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	self->priv->refresh_token = NULL;
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp2_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	spit_host_interface_unset_config_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "refresh_token");
-#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	publishing_you_tube_you_tube_publisher_do_show_service_welcome_pane (self);
-#line 2507 "YouTubePublishing.c"
-}
-
-
-static PublishingYouTubeYouTubePublisherChannelDirectoryTransaction* publishing_you_tube_you_tube_publisher_channel_directory_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session) {
-	PublishingYouTubeYouTubePublisherChannelDirectoryTransaction* self = NULL;
-	PublishingRESTSupportGoogleSession* _tmp0_ = NULL;
-#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp0_ = session;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	self = (PublishingYouTubeYouTubePublisherChannelDirectoryTransaction*) publishing_rest_support_google_publisher_authenticated_transaction_construct (object_type, _tmp0_, PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_CHANNEL_DIRECTORY_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
-#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	return self;
-#line 2522 "YouTubePublishing.c"
-}
-
-
-static PublishingYouTubeYouTubePublisherChannelDirectoryTransaction* publishing_you_tube_you_tube_publisher_channel_directory_transaction_new (PublishingRESTSupportGoogleSession* session) {
-#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	return publishing_you_tube_you_tube_publisher_channel_directory_transaction_construct (PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_TYPE_CHANNEL_DIRECTORY_TRANSACTION, session);
-#line 2529 "YouTubePublishing.c"
-}
-
-
-static gchar* publishing_you_tube_you_tube_publisher_channel_directory_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc) {
-	gchar* result = NULL;
-	xmlNode* document_root = NULL;
-	PublishingRESTSupportXmlDocument* _tmp0_ = NULL;
-	xmlNode* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	xmlNode* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL);
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp0_ = doc;
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp1_ = publishing_rest_support_xml_document_get_root_node (_tmp0_);
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	document_root = _tmp1_;
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp3_ = document_root;
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp4_ = _tmp3_->name;
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	if (g_strcmp0 (_tmp4_, "feed") == 0) {
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp2_ = TRUE;
-#line 2557 "YouTubePublishing.c"
-	} else {
-		xmlNode* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp5_ = document_root;
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp6_ = _tmp5_->name;
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp2_ = g_strcmp0 (_tmp6_, "entry") == 0;
-#line 2567 "YouTubePublishing.c"
-	}
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	if (_tmp2_) {
-#line 116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		result = NULL;
-#line 116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		return result;
-#line 2575 "YouTubePublishing.c"
-	} else {
-		gchar* _tmp7_ = NULL;
-#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp7_ = g_strdup ("response root node isn't a <feed> or <entry>");
-#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		result = _tmp7_;
-#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		return result;
-#line 2584 "YouTubePublishing.c"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_debug ("YouTubePublishing.vala:280: ACTION: logging out user.");
+#line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp0_ = self->priv->authenticator;
+#line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp1_ = spit_publishing_authenticator_can_logout (_tmp0_);
+#line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	if (_tmp1_) {
+#line 1983 "YouTubePublishing.c"
+		SpitPublishingAuthenticator* _tmp2_ = NULL;
+		SpitPublishingAuthenticator* _tmp3_ = NULL;
+#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp2_ = self->priv->authenticator;
+#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		spit_publishing_authenticator_logout (_tmp2_);
+#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp3_ = self->priv->authenticator;
+#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		spit_publishing_authenticator_authenticate (_tmp3_);
+#line 1994 "YouTubePublishing.c"
 	}
 }
 
 
-static void publishing_you_tube_you_tube_publisher_channel_directory_transaction_class_init (PublishingYouTubeYouTubePublisherChannelDirectoryTransactionClass * klass) {
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	publishing_you_tube_you_tube_publisher_channel_directory_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 2592 "YouTubePublishing.c"
-}
-
-
-static void publishing_you_tube_you_tube_publisher_channel_directory_transaction_instance_init (PublishingYouTubeYouTubePublisherChannelDirectoryTransaction * self) {
-}
-
-
-static GType publishing_you_tube_you_tube_publisher_channel_directory_transaction_get_type (void) {
-	static volatile gsize publishing_you_tube_you_tube_publisher_channel_directory_transaction_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_you_tube_you_tube_publisher_channel_directory_transaction_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (PublishingYouTubeYouTubePublisherChannelDirectoryTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_you_tube_you_tube_publisher_channel_directory_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingYouTubeYouTubePublisherChannelDirectoryTransaction), 0, (GInstanceInitFunc) publishing_you_tube_you_tube_publisher_channel_directory_transaction_instance_init, NULL };
-		GType publishing_you_tube_you_tube_publisher_channel_directory_transaction_type_id;
-		publishing_you_tube_you_tube_publisher_channel_directory_transaction_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_AUTHENTICATED_TRANSACTION, "PublishingYouTubeYouTubePublisherChannelDirectoryTransaction", &g_define_type_info, 0);
-		g_once_init_leave (&publishing_you_tube_you_tube_publisher_channel_directory_transaction_type_id__volatile, publishing_you_tube_you_tube_publisher_channel_directory_transaction_type_id);
+static SpitPublishingAuthenticator* publishing_you_tube_you_tube_publisher_real_get_authenticator (PublishingRESTSupportGooglePublisher* base) {
+	PublishingYouTubeYouTubePublisher * self;
+	SpitPublishingAuthenticator* result = NULL;
+	SpitPublishingAuthenticator* _tmp0_ = NULL;
+	SpitPublishingAuthenticator* _tmp5_ = NULL;
+	SpitPublishingAuthenticator* _tmp6_ = NULL;
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, PublishingYouTubeYouTubePublisher);
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp0_ = self->priv->authenticator;
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	if (_tmp0_ == NULL) {
+#line 2011 "YouTubePublishing.c"
+		PublishingAuthenticatorFactory* _tmp1_ = NULL;
+		PublishingAuthenticatorFactory* _tmp2_ = NULL;
+		SpitPublishingPluginHost* _tmp3_ = NULL;
+		SpitPublishingAuthenticator* _tmp4_ = NULL;
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp1_ = publishing_authenticator_factory_get_instance ();
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp2_ = _tmp1_;
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp3_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp4_ = spit_publishing_authenticator_factory_create (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY, SpitPublishingAuthenticatorFactory), "youtube", _tmp3_);
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_g_object_unref0 (self->priv->authenticator);
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		self->priv->authenticator = _tmp4_;
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_g_object_unref0 (_tmp2_);
+#line 2030 "YouTubePublishing.c"
 	}
-	return publishing_you_tube_you_tube_publisher_channel_directory_transaction_type_id__volatile;
+#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp5_ = self->priv->authenticator;
+#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp6_ = _g_object_ref0 (_tmp5_);
+#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	result = _tmp6_;
+#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	return result;
+#line 2040 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_you_tube_publisher_class_init (PublishingYouTubeYouTubePublisherClass * klass) {
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_parent_class = g_type_class_peek_parent (klass);
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingYouTubeYouTubePublisherPrivate));
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	((PublishingRESTSupportGooglePublisherClass *) klass)->is_running = publishing_you_tube_you_tube_publisher_real_is_running;
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	((PublishingRESTSupportGooglePublisherClass *) klass)->start = publishing_you_tube_you_tube_publisher_real_start;
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	((PublishingRESTSupportGooglePublisherClass *) klass)->stop = publishing_you_tube_you_tube_publisher_real_stop;
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	((PublishingRESTSupportGooglePublisherClass *) klass)->on_login_flow_complete = publishing_you_tube_you_tube_publisher_real_on_login_flow_complete;
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	((PublishingRESTSupportGooglePublisherClass *) klass)->do_logout = publishing_you_tube_you_tube_publisher_real_do_logout;
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	((PublishingRESTSupportGooglePublisherClass *) klass)->get_authenticator = publishing_you_tube_you_tube_publisher_real_get_authenticator;
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_you_tube_you_tube_publisher_finalize;
-#line 2629 "YouTubePublishing.c"
+#line 2063 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_you_tube_publisher_instance_init (PublishingYouTubeYouTubePublisher * self) {
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv = PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_GET_PRIVATE (self);
-#line 2636 "YouTubePublishing.c"
+#line 2070 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_you_tube_publisher_finalize (GObject* obj) {
 	PublishingYouTubeYouTubePublisher * self;
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, PublishingYouTubeYouTubePublisher);
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (self->priv->refresh_token);
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_you_tube_publishing_parameters_unref0 (self->priv->publishing_parameters);
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->progress_reporter = NULL;
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->progress_reporter_target = NULL;
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (self->priv->authenticator);
+#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (self->priv->youtube_service);
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	G_OBJECT_CLASS (publishing_you_tube_you_tube_publisher_parent_class)->finalize (obj);
-#line 2658 "YouTubePublishing.c"
+#line 2094 "YouTubePublishing.c"
 }
 
 
@@ -2705,34 +2114,34 @@ GType publishing_you_tube_you_tube_publisher_get_type (void) {
 
 
 static gpointer _publishing_you_tube_publishing_parameters_ref0 (gpointer self) {
-#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self ? publishing_you_tube_publishing_parameters_ref (self) : NULL;
-#line 2677 "YouTubePublishing.c"
+#line 2113 "YouTubePublishing.c"
 }
 
 
 static gpointer _publishing_you_tube_publishing_options_pane_privacy_description_ref0 (gpointer self) {
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self ? publishing_you_tube_publishing_options_pane_privacy_description_ref (self) : NULL;
-#line 2684 "YouTubePublishing.c"
+#line 2120 "YouTubePublishing.c"
 }
 
 
 static void _publishing_you_tube_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_publishing_options_pane_on_logout_clicked ((PublishingYouTubePublishingOptionsPane*) self);
-#line 2691 "YouTubePublishing.c"
+#line 2127 "YouTubePublishing.c"
 }
 
 
 static void _publishing_you_tube_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_publishing_options_pane_on_publish_clicked ((PublishingYouTubePublishingOptionsPane*) self);
-#line 2698 "YouTubePublishing.c"
+#line 2134 "YouTubePublishing.c"
 }
 
 
-PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_pane_construct (GType object_type, SpitPublishingPluginHost* host, GtkBuilder* builder, PublishingYouTubePublishingParameters* publishing_parameters) {
+PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_pane_construct (GType object_type, SpitPublishingAuthenticator* authenticator, SpitPublishingPluginHost* host, GtkBuilder* builder, PublishingYouTubePublishingParameters* publishing_parameters) {
 	PublishingYouTubePublishingOptionsPane * self = NULL;
 	gint _tmp0_ = 0;
 	PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp1_ = NULL;
@@ -2753,270 +2162,257 @@ PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_p
 	GtkComboBoxText* _tmp16_ = NULL;
 	GtkBuilder* _tmp17_ = NULL;
 	GObject* _tmp18_ = NULL;
-	GtkLabel* _tmp19_ = NULL;
+	GtkButton* _tmp19_ = NULL;
 	GtkBuilder* _tmp20_ = NULL;
 	GObject* _tmp21_ = NULL;
 	GtkButton* _tmp22_ = NULL;
 	GtkBuilder* _tmp23_ = NULL;
 	GObject* _tmp24_ = NULL;
-	GtkButton* _tmp25_ = NULL;
+	GtkBox* _tmp25_ = NULL;
 	GtkBuilder* _tmp26_ = NULL;
 	GObject* _tmp27_ = NULL;
-	GtkBox* _tmp28_ = NULL;
-	GtkBuilder* _tmp29_ = NULL;
-	GObject* _tmp30_ = NULL;
-	GtkLabel* _tmp31_ = NULL;
-	GtkLabel* _tmp32_ = NULL;
-	const gchar* _tmp33_ = NULL;
-	PublishingYouTubePublishingParameters* _tmp34_ = NULL;
-	gchar* _tmp35_ = NULL;
-	gchar* _tmp36_ = NULL;
-	gchar* _tmp37_ = NULL;
+	GtkLabel* _tmp28_ = NULL;
+	SpitPublishingAuthenticator* _tmp29_ = NULL;
+	gboolean _tmp30_ = FALSE;
+	GtkLabel* _tmp35_ = NULL;
+	const gchar* _tmp36_ = NULL;
+	PublishingYouTubePublishingParameters* _tmp37_ = NULL;
 	gchar* _tmp38_ = NULL;
-	GtkLabel* _tmp39_ = NULL;
-	const gchar* _tmp40_ = NULL;
-	PublishingYouTubePublishingParameters* _tmp41_ = NULL;
-	gchar* _tmp42_ = NULL;
-	gchar* _tmp43_ = NULL;
-	gchar* _tmp44_ = NULL;
-	gchar* _tmp45_ = NULL;
-	PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp46_ = NULL;
-	gint _tmp46__length1 = 0;
-	GtkComboBoxText* _tmp51_ = NULL;
-	GtkLabel* _tmp52_ = NULL;
-	GtkComboBoxText* _tmp53_ = NULL;
-	GtkButton* _tmp54_ = NULL;
-	GtkButton* _tmp55_ = NULL;
-#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	gchar* _tmp39_ = NULL;
+	gchar* _tmp40_ = NULL;
+	gchar* _tmp41_ = NULL;
+	PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp42_ = NULL;
+	gint _tmp42__length1 = 0;
+	GtkComboBoxText* _tmp47_ = NULL;
+	GtkLabel* _tmp48_ = NULL;
+	GtkComboBoxText* _tmp49_ = NULL;
+	GtkButton* _tmp50_ = NULL;
+	GtkButton* _tmp51_ = NULL;
+#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_return_val_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR (authenticator), NULL);
+#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
-#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (GTK_IS_BUILDER (builder), NULL);
-#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_PARAMETERS (publishing_parameters), NULL);
-#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = (PublishingYouTubePublishingOptionsPane*) g_object_new (object_type, NULL);
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1_ = publishing_you_tube_publishing_options_pane_create_privacy_descriptions (self, &_tmp0_);
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->privacy_descriptions = (_vala_array_free (self->priv->privacy_descriptions, self->priv->privacy_descriptions_length1, (GDestroyNotify) publishing_you_tube_publishing_options_pane_privacy_description_unref), NULL);
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->privacy_descriptions = _tmp1_;
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->privacy_descriptions_length1 = _tmp0_;
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->_privacy_descriptions_size_ = self->priv->privacy_descriptions_length1;
-#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp2_ = publishing_parameters;
-#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp3_ = _publishing_you_tube_publishing_parameters_ref0 (_tmp2_);
-#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_you_tube_publishing_parameters_unref0 (self->priv->publishing_parameters);
-#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->publishing_parameters = _tmp3_;
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp4_ = builder;
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->builder = _tmp5_;
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp6_ = builder;
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_vala_assert (_tmp6_ != NULL, "builder != null");
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp7_ = builder;
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp8_ = gtk_builder_get_objects (_tmp7_);
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp9_ = _tmp8_;
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp10_ = g_slist_length (_tmp9_);
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_vala_assert (_tmp10_ > ((guint) 0), "builder.get_objects().length() > 0");
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_slist_free0 (_tmp9_);
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp11_ = self->priv->builder;
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp12_ = gtk_builder_get_object (_tmp11_, "login_identity_label");
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp13_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp12_) : NULL);
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (self->priv->login_identity_label);
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->login_identity_label = _tmp13_;
-#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp14_ = self->priv->builder;
-#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp15_ = gtk_builder_get_object (_tmp14_, "privacy_combo");
-#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp16_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp15_) : NULL);
-#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (self->priv->privacy_combo);
-#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->privacy_combo = _tmp16_;
-#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp17_ = self->priv->builder;
-#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp18_ = gtk_builder_get_object (_tmp17_, "publish_to_label");
-#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp18_) : NULL);
-#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_object_unref0 (self->priv->publish_to_label);
-#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	self->priv->publish_to_label = _tmp19_;
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp18_ = gtk_builder_get_object (_tmp17_, "publish_button");
+#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, gtk_button_get_type ()) ? ((GtkButton*) _tmp18_) : NULL);
+#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (self->priv->publish_button);
+#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	self->priv->publish_button = _tmp19_;
+#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp20_ = self->priv->builder;
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp21_ = gtk_builder_get_object (_tmp20_, "publish_button");
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp21_ = gtk_builder_get_object (_tmp20_, "logout_button");
+#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, gtk_button_get_type ()) ? ((GtkButton*) _tmp21_) : NULL);
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_object_unref0 (self->priv->publish_button);
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	self->priv->publish_button = _tmp22_;
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp23_ = self->priv->builder;
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp24_ = gtk_builder_get_object (_tmp23_, "logout_button");
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp24_, gtk_button_get_type ()) ? ((GtkButton*) _tmp24_) : NULL);
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (self->priv->logout_button);
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	self->priv->logout_button = _tmp25_;
-#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp26_ = self->priv->builder;
-#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp27_ = gtk_builder_get_object (_tmp26_, "youtube_pane_widget");
-#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, gtk_box_get_type ()) ? ((GtkBox*) _tmp27_) : NULL);
-#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	self->priv->logout_button = _tmp22_;
+#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp23_ = self->priv->builder;
+#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp24_ = gtk_builder_get_object (_tmp23_, "youtube_pane_widget");
+#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp24_, gtk_box_get_type ()) ? ((GtkBox*) _tmp24_) : NULL);
+#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (self->priv->pane_widget);
-#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	self->priv->pane_widget = _tmp28_;
-#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp29_ = self->priv->builder;
-#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp30_ = gtk_builder_get_object (_tmp29_, "privacy_label");
-#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp31_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp30_) : NULL);
-#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	self->priv->pane_widget = _tmp25_;
+#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp26_ = self->priv->builder;
+#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp27_ = gtk_builder_get_object (_tmp26_, "privacy_label");
+#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp27_) : NULL);
+#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (self->priv->privacy_label);
-#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	self->priv->privacy_label = _tmp31_;
-#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp32_ = self->priv->login_identity_label;
-#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp33_ = _ ("You are logged into YouTube as %s.");
-#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp34_ = publishing_parameters;
-#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp35_ = publishing_you_tube_publishing_parameters_get_user_name (_tmp34_);
-#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp36_ = _tmp35_;
-#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp37_ = g_strdup_printf (_tmp33_, _tmp36_);
-#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp38_ = _tmp37_;
-#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	gtk_label_set_label (_tmp32_, _tmp38_);
-#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (_tmp38_);
-#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (_tmp36_);
-#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”");
-#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"
-	_tmp42_ = publishing_you_tube_publishing_parameters_get_channel_name (_tmp41_);
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp43_ = _tmp42_;
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp44_ = g_strdup_printf (_tmp40_, _tmp43_);
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp45_ = _tmp44_;
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	gtk_label_set_label (_tmp39_, _tmp45_);
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (_tmp45_);
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (_tmp43_);
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp46_ = self->priv->privacy_descriptions;
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp46__length1 = self->priv->privacy_descriptions_length1;
-#line 2921 "YouTubePublishing.c"
+#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	self->priv->privacy_label = _tmp28_;
+#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp29_ = authenticator;
+#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp30_ = spit_publishing_authenticator_can_logout (_tmp29_);
+#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	if (!_tmp30_) {
+#line 2303 "YouTubePublishing.c"
+		GtkButton* _tmp31_ = NULL;
+		GtkContainer* _tmp32_ = NULL;
+		GtkContainer* _tmp33_ = NULL;
+		GtkButton* _tmp34_ = NULL;
+#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp31_ = self->priv->logout_button;
+#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp32_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget));
+#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp33_ = _tmp32_;
+#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp34_ = self->priv->logout_button;
+#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		gtk_container_remove (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget));
+#line 2318 "YouTubePublishing.c"
+	}
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp35_ = self->priv->login_identity_label;
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp36_ = _ ("You are logged into YouTube as %s.");
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp37_ = publishing_parameters;
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp38_ = publishing_you_tube_publishing_parameters_get_user_name (_tmp37_);
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp39_ = _tmp38_;
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp40_ = g_strdup_printf (_tmp36_, _tmp39_);
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp41_ = _tmp40_;
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	gtk_label_set_label (_tmp35_, _tmp41_);
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_free0 (_tmp41_);
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_free0 (_tmp39_);
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp42_ = self->priv->privacy_descriptions;
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp42__length1 = self->priv->privacy_descriptions_length1;
+#line 2344 "YouTubePublishing.c"
 	{
 		PublishingYouTubePublishingOptionsPanePrivacyDescription** desc_collection = NULL;
 		gint desc_collection_length1 = 0;
 		gint _desc_collection_size_ = 0;
 		gint desc_it = 0;
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		desc_collection = _tmp46_;
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		desc_collection_length1 = _tmp46__length1;
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		for (desc_it = 0; desc_it < _tmp46__length1; desc_it = desc_it + 1) {
-#line 2933 "YouTubePublishing.c"
-			PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp47_ = NULL;
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		desc_collection = _tmp42_;
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		desc_collection_length1 = _tmp42__length1;
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		for (desc_it = 0; desc_it < _tmp42__length1; desc_it = desc_it + 1) {
+#line 2356 "YouTubePublishing.c"
+			PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp43_ = NULL;
 			PublishingYouTubePublishingOptionsPanePrivacyDescription* desc = NULL;
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_tmp47_ = _publishing_you_tube_publishing_options_pane_privacy_description_ref0 (desc_collection[desc_it]);
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			desc = _tmp47_;
-#line 2940 "YouTubePublishing.c"
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			_tmp43_ = _publishing_you_tube_publishing_options_pane_privacy_description_ref0 (desc_collection[desc_it]);
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			desc = _tmp43_;
+#line 2363 "YouTubePublishing.c"
 			{
-				GtkComboBoxText* _tmp48_ = NULL;
-				PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp49_ = NULL;
-				const gchar* _tmp50_ = NULL;
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				_tmp48_ = self->priv->privacy_combo;
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				_tmp49_ = desc;
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				_tmp50_ = _tmp49_->description;
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				gtk_combo_box_text_append_text (_tmp48_, _tmp50_);
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+				GtkComboBoxText* _tmp44_ = NULL;
+				PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp45_ = NULL;
+				const gchar* _tmp46_ = NULL;
+#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+				_tmp44_ = self->priv->privacy_combo;
+#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+				_tmp45_ = desc;
+#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+				_tmp46_ = _tmp45_->description;
+#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+				gtk_combo_box_text_append_text (_tmp44_, _tmp46_);
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 				_publishing_you_tube_publishing_options_pane_privacy_description_unref0 (desc);
-#line 2955 "YouTubePublishing.c"
+#line 2378 "YouTubePublishing.c"
 			}
 		}
 	}
-#line 471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp51_ = self->priv->privacy_combo;
-#line 471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_combo_box_get_type (), GtkComboBox), (gint) PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PUBLIC);
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp52_ = self->priv->privacy_label;
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp53_ = self->priv->privacy_combo;
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	gtk_label_set_mnemonic_widget (_tmp52_, G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_widget_get_type (), GtkWidget));
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp54_ = self->priv->logout_button;
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_connect_object (_tmp54_, "clicked", (GCallback) _publishing_you_tube_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp55_ = self->priv->publish_button;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_connect_object (_tmp55_, "clicked", (GCallback) _publishing_you_tube_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
-#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp47_ = self->priv->privacy_combo;
+#line 351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_combo_box_get_type (), GtkComboBox), (gint) PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PUBLIC);
+#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp48_ = self->priv->privacy_label;
+#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp49_ = self->priv->privacy_combo;
+#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	gtk_label_set_mnemonic_widget (_tmp48_, G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget));
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp50_ = self->priv->logout_button;
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_signal_connect_object (_tmp50_, "clicked", (GCallback) _publishing_you_tube_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
+#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp51_ = self->priv->publish_button;
+#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_signal_connect_object (_tmp51_, "clicked", (GCallback) _publishing_you_tube_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
+#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self;
-#line 2979 "YouTubePublishing.c"
+#line 2402 "YouTubePublishing.c"
 }
 
 
-PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_pane_new (SpitPublishingPluginHost* host, GtkBuilder* builder, PublishingYouTubePublishingParameters* publishing_parameters) {
-#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	return publishing_you_tube_publishing_options_pane_construct (PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, host, builder, publishing_parameters);
-#line 2986 "YouTubePublishing.c"
+PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_pane_new (SpitPublishingAuthenticator* authenticator, SpitPublishingPluginHost* host, GtkBuilder* builder, PublishingYouTubePublishingParameters* publishing_parameters) {
+#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	return publishing_you_tube_publishing_options_pane_construct (PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, authenticator, host, builder, publishing_parameters);
+#line 2409 "YouTubePublishing.c"
 }
 
 
@@ -3028,99 +2424,99 @@ static void publishing_you_tube_publishing_options_pane_on_publish_clicked (Publ
 	gint _tmp3_ = 0;
 	PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp4_ = NULL;
 	PublishingYouTubePrivacySetting _tmp5_ = 0;
-#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = self->priv->publishing_parameters;
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1_ = self->priv->privacy_descriptions;
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1__length1 = self->priv->privacy_descriptions_length1;
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp2_ = self->priv->privacy_combo;
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox));
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp4_ = _tmp1_[_tmp3_];
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp5_ = _tmp4_->privacy_setting;
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_publishing_parameters_set_privacy (_tmp0_, _tmp5_);
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_signal_emit_by_name (self, "publish");
-#line 3018 "YouTubePublishing.c"
+#line 2441 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_publishing_options_pane_on_logout_clicked (PublishingYouTubePublishingOptionsPane* self) {
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_signal_emit_by_name (self, "logout");
-#line 3027 "YouTubePublishing.c"
+#line 2450 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_publishing_options_pane_update_publish_button_sensitivity (PublishingYouTubePublishingOptionsPane* self) {
 	GtkButton* _tmp0_ = NULL;
-#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = self->priv->publish_button;
-#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 3039 "YouTubePublishing.c"
+#line 2462 "YouTubePublishing.c"
 }
 
 
-static void _vala_array_add31 (PublishingYouTubePublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) {
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+static void _vala_array_add32 (PublishingYouTubePublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) {
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if ((*length) == (*size)) {
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*array = g_renew (PublishingYouTubePublishingOptionsPanePrivacyDescription*, *array, (*size) + 1);
-#line 3050 "YouTubePublishing.c"
+#line 2473 "YouTubePublishing.c"
 	}
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	(*array)[(*length)++] = value;
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	(*array)[*length] = NULL;
-#line 3056 "YouTubePublishing.c"
+#line 2479 "YouTubePublishing.c"
 }
 
 
-static void _vala_array_add32 (PublishingYouTubePublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) {
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+static void _vala_array_add33 (PublishingYouTubePublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) {
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if ((*length) == (*size)) {
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*array = g_renew (PublishingYouTubePublishingOptionsPanePrivacyDescription*, *array, (*size) + 1);
-#line 3067 "YouTubePublishing.c"
+#line 2490 "YouTubePublishing.c"
 	}
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	(*array)[(*length)++] = value;
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	(*array)[*length] = NULL;
-#line 3073 "YouTubePublishing.c"
+#line 2496 "YouTubePublishing.c"
 }
 
 
-static void _vala_array_add33 (PublishingYouTubePublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) {
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+static void _vala_array_add34 (PublishingYouTubePublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) {
+#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if ((*length) == (*size)) {
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*array = g_renew (PublishingYouTubePublishingOptionsPanePrivacyDescription*, *array, (*size) + 1);
-#line 3084 "YouTubePublishing.c"
+#line 2507 "YouTubePublishing.c"
 	}
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	(*array)[(*length)++] = value;
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	(*array)[*length] = NULL;
-#line 3090 "YouTubePublishing.c"
+#line 2513 "YouTubePublishing.c"
 }
 
 
@@ -3144,61 +2540,61 @@ static PublishingYouTubePublishingOptionsPanePrivacyDescription** publishing_you
 	PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp9_ = NULL;
 	PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp10_ = NULL;
 	gint _tmp10__length1 = 0;
-#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = g_new0 (PublishingYouTubePublishingOptionsPanePrivacyDescription*, 0 + 1);
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_result_ = _tmp0_;
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_result__length1 = 0;
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	__result__size_ = _result__length1;
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1_ = _result_;
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1__length1 = _result__length1;
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp2_ = _ ("Public listed");
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp3_ = publishing_you_tube_publishing_options_pane_privacy_description_new (_tmp2_, PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PUBLIC);
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_vala_array_add31 (&_result_, &_result__length1, &__result__size_, _tmp3_);
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_vala_array_add32 (&_result_, &_result__length1, &__result__size_, _tmp3_);
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp4_ = _result_;
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp4__length1 = _result__length1;
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp5_ = _ ("Public unlisted");
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp6_ = publishing_you_tube_publishing_options_pane_privacy_description_new (_tmp5_, PUBLISHING_YOU_TUBE_PRIVACY_SETTING_UNLISTED);
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_vala_array_add32 (&_result_, &_result__length1, &__result__size_, _tmp6_);
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_vala_array_add33 (&_result_, &_result__length1, &__result__size_, _tmp6_);
+#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp7_ = _result_;
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp7__length1 = _result__length1;
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp8_ = _ ("Private");
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp9_ = publishing_you_tube_publishing_options_pane_privacy_description_new (_tmp8_, PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PRIVATE);
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_vala_array_add33 (&_result_, &_result__length1, &__result__size_, _tmp9_);
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_vala_array_add34 (&_result_, &_result__length1, &__result__size_, _tmp9_);
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp10_ = _result_;
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp10__length1 = _result__length1;
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (result_length1) {
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*result_length1 = _tmp10__length1;
-#line 3162 "YouTubePublishing.c"
+#line 2585 "YouTubePublishing.c"
 	}
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	result = _tmp10_;
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 3168 "YouTubePublishing.c"
+#line 2591 "YouTubePublishing.c"
 }
 
 
@@ -3208,52 +2604,52 @@ static GtkWidget* publishing_you_tube_publishing_options_pane_real_get_widget (S
 	GtkBox* _tmp0_ = NULL;
 	GtkBox* _tmp1_ = NULL;
 	GtkWidget* _tmp2_ = NULL;
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYouTubePublishingOptionsPane);
-#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = self->priv->pane_widget;
-#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_vala_assert (_tmp0_ != NULL, "pane_widget != null");
-#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1_ = self->priv->pane_widget;
-#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	result = _tmp2_;
-#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 3192 "YouTubePublishing.c"
+#line 2615 "YouTubePublishing.c"
 }
 
 
 static SpitPublishingDialogPaneGeometryOptions publishing_you_tube_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
 	PublishingYouTubePublishingOptionsPane * self;
 	SpitPublishingDialogPaneGeometryOptions result = 0;
-#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYouTubePublishingOptionsPane);
-#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 3205 "YouTubePublishing.c"
+#line 2628 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
 	PublishingYouTubePublishingOptionsPane * self;
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYouTubePublishingOptionsPane);
-#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 3215 "YouTubePublishing.c"
+#line 2638 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
 	PublishingYouTubePublishingOptionsPane * self;
-#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYouTubePublishingOptionsPane);
-#line 3223 "YouTubePublishing.c"
+#line 2646 "YouTubePublishing.c"
 }
 
 
@@ -3262,240 +2658,240 @@ static PublishingYouTubePublishingOptionsPanePrivacyDescription* publishing_you_
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
 	PublishingYouTubePrivacySetting _tmp2_ = 0;
-#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (description != NULL, NULL);
-#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = (PublishingYouTubePublishingOptionsPanePrivacyDescription*) g_type_create_instance (object_type);
-#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = description;
-#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_free0 (self->description);
-#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->description = _tmp1_;
-#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp2_ = privacy_setting;
-#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->privacy_setting = _tmp2_;
-#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self;
-#line 3250 "YouTubePublishing.c"
+#line 2673 "YouTubePublishing.c"
 }
 
 
 static PublishingYouTubePublishingOptionsPanePrivacyDescription* publishing_you_tube_publishing_options_pane_privacy_description_new (const gchar* description, PublishingYouTubePrivacySetting privacy_setting) {
-#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return publishing_you_tube_publishing_options_pane_privacy_description_construct (PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION, description, privacy_setting);
-#line 3257 "YouTubePublishing.c"
+#line 2680 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_publishing_options_pane_value_privacy_description_init (GValue* value) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 3264 "YouTubePublishing.c"
+#line 2687 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_publishing_options_pane_value_privacy_description_free_value (GValue* value) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_you_tube_publishing_options_pane_privacy_description_unref (value->data[0].v_pointer);
-#line 3273 "YouTubePublishing.c"
+#line 2696 "YouTubePublishing.c"
 	}
 }
 
 
 static void publishing_you_tube_publishing_options_pane_value_privacy_description_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		dest_value->data[0].v_pointer = publishing_you_tube_publishing_options_pane_privacy_description_ref (src_value->data[0].v_pointer);
-#line 3283 "YouTubePublishing.c"
+#line 2706 "YouTubePublishing.c"
 	} else {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3287 "YouTubePublishing.c"
+#line 2710 "YouTubePublishing.c"
 	}
 }
 
 
 static gpointer publishing_you_tube_publishing_options_pane_value_privacy_description_peek_pointer (const GValue* value) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return value->data[0].v_pointer;
-#line 3295 "YouTubePublishing.c"
+#line 2718 "YouTubePublishing.c"
 }
 
 
 static gchar* publishing_you_tube_publishing_options_pane_value_privacy_description_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 3302 "YouTubePublishing.c"
+#line 2725 "YouTubePublishing.c"
 		PublishingYouTubePublishingOptionsPanePrivacyDescription* object;
 		object = collect_values[0].v_pointer;
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3309 "YouTubePublishing.c"
+#line 2732 "YouTubePublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.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 3313 "YouTubePublishing.c"
+#line 2736 "YouTubePublishing.c"
 		}
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = publishing_you_tube_publishing_options_pane_privacy_description_ref (object);
-#line 3317 "YouTubePublishing.c"
+#line 2740 "YouTubePublishing.c"
 	} else {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 3321 "YouTubePublishing.c"
+#line 2744 "YouTubePublishing.c"
 	}
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return NULL;
-#line 3325 "YouTubePublishing.c"
+#line 2748 "YouTubePublishing.c"
 }
 
 
 static gchar* publishing_you_tube_publishing_options_pane_value_privacy_description_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingYouTubePublishingOptionsPanePrivacyDescription** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (!object_p) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3336 "YouTubePublishing.c"
+#line 2759 "YouTubePublishing.c"
 	}
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*object_p = NULL;
-#line 3342 "YouTubePublishing.c"
+#line 2765 "YouTubePublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3346 "YouTubePublishing.c"
+#line 2769 "YouTubePublishing.c"
 	} else {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*object_p = publishing_you_tube_publishing_options_pane_privacy_description_ref (value->data[0].v_pointer);
-#line 3350 "YouTubePublishing.c"
+#line 2773 "YouTubePublishing.c"
 	}
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return NULL;
-#line 3354 "YouTubePublishing.c"
+#line 2777 "YouTubePublishing.c"
 }
 
 
 static GParamSpec* publishing_you_tube_publishing_options_pane_param_spec_privacy_description (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingYouTubePublishingOptionsPaneParamSpecPrivacyDescription* spec;
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION), NULL);
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 3368 "YouTubePublishing.c"
+#line 2791 "YouTubePublishing.c"
 }
 
 
 static gpointer publishing_you_tube_publishing_options_pane_value_get_privacy_description (const GValue* value) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION), NULL);
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return value->data[0].v_pointer;
-#line 3377 "YouTubePublishing.c"
+#line 2800 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_publishing_options_pane_value_set_privacy_description (GValue* value, gpointer v_object) {
 	PublishingYouTubePublishingOptionsPanePrivacyDescription* old;
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION));
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	old = value->data[0].v_pointer;
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (v_object) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION));
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_you_tube_publishing_options_pane_privacy_description_ref (value->data[0].v_pointer);
-#line 3397 "YouTubePublishing.c"
+#line 2820 "YouTubePublishing.c"
 	} else {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 3401 "YouTubePublishing.c"
+#line 2824 "YouTubePublishing.c"
 	}
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (old) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_you_tube_publishing_options_pane_privacy_description_unref (old);
-#line 3407 "YouTubePublishing.c"
+#line 2830 "YouTubePublishing.c"
 	}
 }
 
 
 static void publishing_you_tube_publishing_options_pane_value_take_privacy_description (GValue* value, gpointer v_object) {
 	PublishingYouTubePublishingOptionsPanePrivacyDescription* old;
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION));
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	old = value->data[0].v_pointer;
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (v_object) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION));
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 3426 "YouTubePublishing.c"
+#line 2849 "YouTubePublishing.c"
 	} else {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 3430 "YouTubePublishing.c"
+#line 2853 "YouTubePublishing.c"
 	}
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (old) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_you_tube_publishing_options_pane_privacy_description_unref (old);
-#line 3436 "YouTubePublishing.c"
+#line 2859 "YouTubePublishing.c"
 	}
 }
 
 
 static void publishing_you_tube_publishing_options_pane_privacy_description_class_init (PublishingYouTubePublishingOptionsPanePrivacyDescriptionClass * klass) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_publishing_options_pane_privacy_description_parent_class = g_type_class_peek_parent (klass);
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	((PublishingYouTubePublishingOptionsPanePrivacyDescriptionClass *) klass)->finalize = publishing_you_tube_publishing_options_pane_privacy_description_finalize;
-#line 3446 "YouTubePublishing.c"
+#line 2869 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_publishing_options_pane_privacy_description_instance_init (PublishingYouTubePublishingOptionsPanePrivacyDescription * self) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->ref_count = 1;
-#line 3453 "YouTubePublishing.c"
+#line 2876 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_publishing_options_pane_privacy_description_finalize (PublishingYouTubePublishingOptionsPanePrivacyDescription* obj) {
 	PublishingYouTubePublishingOptionsPanePrivacyDescription * self;
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION, PublishingYouTubePublishingOptionsPanePrivacyDescription);
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_free0 (self->description);
-#line 3465 "YouTubePublishing.c"
+#line 2888 "YouTubePublishing.c"
 }
 
 
@@ -3516,108 +2912,104 @@ static GType publishing_you_tube_publishing_options_pane_privacy_description_get
 static gpointer publishing_you_tube_publishing_options_pane_privacy_description_ref (gpointer instance) {
 	PublishingYouTubePublishingOptionsPanePrivacyDescription* self;
 	self = instance;
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return instance;
-#line 3490 "YouTubePublishing.c"
+#line 2913 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_publishing_options_pane_privacy_description_unref (gpointer instance) {
 	PublishingYouTubePublishingOptionsPanePrivacyDescription* self;
 	self = instance;
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_PRIVACY_DESCRIPTION_GET_CLASS (self)->finalize (self);
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3503 "YouTubePublishing.c"
+#line 2926 "YouTubePublishing.c"
 	}
 }
 
 
 static void publishing_you_tube_publishing_options_pane_class_init (PublishingYouTubePublishingOptionsPaneClass * klass) {
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_publishing_options_pane_parent_class = g_type_class_peek_parent (klass);
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingYouTubePublishingOptionsPanePrivate));
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_you_tube_publishing_options_pane_finalize;
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_signal_new ("publish", PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_signal_new ("logout", PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 3519 "YouTubePublishing.c"
+#line 2942 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_you_tube_publishing_options_pane_real_get_widget;
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_you_tube_publishing_options_pane_real_get_preferred_geometry;
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_you_tube_publishing_options_pane_real_on_pane_installed;
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_you_tube_publishing_options_pane_real_on_pane_uninstalled;
-#line 3534 "YouTubePublishing.c"
+#line 2957 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_publishing_options_pane_instance_init (PublishingYouTubePublishingOptionsPane * self) {
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv = PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->pane_widget = NULL;
-#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->privacy_combo = NULL;
-#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	self->priv->publish_to_label = NULL;
-#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->login_identity_label = NULL;
-#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->publish_button = NULL;
-#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->logout_button = NULL;
-#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->builder = NULL;
-#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->privacy_label = NULL;
-#line 3557 "YouTubePublishing.c"
+#line 2978 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_publishing_options_pane_finalize (GObject* obj) {
 	PublishingYouTubePublishingOptionsPane * self;
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYouTubePublishingOptionsPane);
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (self->priv->pane_widget);
-#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (self->priv->privacy_combo);
-#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_object_unref0 (self->priv->publish_to_label);
-#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (self->priv->login_identity_label);
-#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (self->priv->publish_button);
-#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (self->priv->logout_button);
-#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (self->priv->privacy_label);
-#line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->privacy_descriptions = (_vala_array_free (self->priv->privacy_descriptions, self->priv->privacy_descriptions_length1, (GDestroyNotify) publishing_you_tube_publishing_options_pane_privacy_description_unref), NULL);
-#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_you_tube_publishing_parameters_unref0 (self->priv->publishing_parameters);
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	G_OBJECT_CLASS (publishing_you_tube_publishing_options_pane_parent_class)->finalize (obj);
-#line 3587 "YouTubePublishing.c"
+#line 3006 "YouTubePublishing.c"
 }
 
 
@@ -3635,14 +3027,7 @@ GType publishing_you_tube_publishing_options_pane_get_type (void) {
 }
 
 
-static gpointer _publishing_rest_support_session_ref0 (gpointer self) {
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	return self ? publishing_rest_support_session_ref (self) : NULL;
-#line 3608 "YouTubePublishing.c"
-}
-
-
-PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session, PublishingYouTubePublishingParameters* parameters, SpitPublishingPublishable* publishable) {
+PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_construct (GType object_type, GDataYouTubeService* youtube_service, PublishingRESTSupportGoogleSession* session, PublishingYouTubePublishingParameters* parameters, SpitPublishingPublishable* publishable) {
 	PublishingYouTubeUploadTransaction* self = NULL;
 	PublishingRESTSupportGoogleSession* _tmp0_ = NULL;
 	PublishingRESTSupportGoogleSession* _tmp1_ = NULL;
@@ -3653,668 +3038,905 @@ PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_const
 	PublishingYouTubePublishingParameters* _tmp6_ = NULL;
 	SpitPublishingPublishable* _tmp7_ = NULL;
 	SpitPublishingPublishable* _tmp8_ = NULL;
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	GDataYouTubeService* _tmp9_ = NULL;
+	GDataYouTubeService* _tmp10_ = NULL;
+#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_return_val_if_fail (GDATA_IS_YOUTUBE_SERVICE (youtube_service), NULL);
+#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_PARAMETERS (parameters), NULL);
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = session;
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = (PublishingYouTubeUploadTransaction*) publishing_rest_support_google_publisher_authenticated_transaction_construct (object_type, _tmp0_, PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1_ = session;
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp2_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_vala_assert (_tmp2_, "session.is_authenticated()");
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp3_ = session;
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp4_ = _publishing_rest_support_session_ref0 (_tmp3_);
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->session = _tmp4_;
-#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp5_ = parameters;
-#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp6_ = _publishing_you_tube_publishing_parameters_ref0 (_tmp5_);
-#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_you_tube_publishing_parameters_unref0 (self->priv->parameters);
-#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->parameters = _tmp6_;
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp7_ = publishable;
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp8_ = _g_object_ref0 (_tmp7_);
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (self->priv->publishable);
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->publishable = _tmp8_;
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp9_ = youtube_service;
+#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp10_ = _g_object_ref0 (_tmp9_);
+#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (self->priv->youtube_service);
+#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	self->priv->youtube_service = _tmp10_;
+#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self;
-#line 3665 "YouTubePublishing.c"
+#line 3089 "YouTubePublishing.c"
 }
 
 
-PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_new (PublishingRESTSupportGoogleSession* session, PublishingYouTubePublishingParameters* parameters, SpitPublishingPublishable* publishable) {
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	return publishing_you_tube_upload_transaction_construct (PUBLISHING_YOU_TUBE_TYPE_UPLOAD_TRANSACTION, session, parameters, publishable);
-#line 3672 "YouTubePublishing.c"
+PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_new (GDataYouTubeService* youtube_service, PublishingRESTSupportGoogleSession* session, PublishingYouTubePublishingParameters* parameters, SpitPublishingPublishable* publishable) {
+#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	return publishing_you_tube_upload_transaction_construct (PUBLISHING_YOU_TUBE_TYPE_UPLOAD_TRANSACTION, youtube_service, session, parameters, publishable);
+#line 3096 "YouTubePublishing.c"
 }
 
 
-static guint8* string_get_data (const gchar* self, int* result_length1) {
-	guint8* result;
-	guint8* res = NULL;
-	gint res_length1 = 0;
-	gint _res_size_ = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	guint8* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	guint8* _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-#line 1398 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	res = (guint8*) self;
-#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	res_length1 = -1;
-#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_res_size_ = res_length1;
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp0_ = strlen (self);
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp1_ = _tmp0_;
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	res_length1 = (gint) _tmp1_;
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp2_ = res_length1;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp3_ = res;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp3__length1 = res_length1;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp4_ = _tmp3_;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp4__length1 = _tmp3__length1;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (result_length1) {
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		*result_length1 = _tmp4__length1;
-#line 3716 "YouTubePublishing.c"
+static Block1Data* block1_data_ref (Block1Data* _data1_) {
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_atomic_int_inc (&_data1_->_ref_count_);
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	return _data1_;
+#line 3105 "YouTubePublishing.c"
+}
+
+
+static void block1_data_unref (void * _userdata_) {
+	Block1Data* _data1_;
+	_data1_ = (Block1Data*) _userdata_;
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) {
+#line 3114 "YouTubePublishing.c"
+		PublishingYouTubeUploadTransaction* self;
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		self = _data1_->self;
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_g_main_loop_unref0 (_data1_->loop);
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_publishing_rest_support_transaction_unref0 (self);
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		g_slice_free (Block1Data, _data1_);
+#line 3124 "YouTubePublishing.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 3722 "YouTubePublishing.c"
 }
 
 
-static void _vala_SoupBuffer_free (SoupBuffer* self) {
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_boxed_free (soup_buffer_get_type (), self);
-#line 3729 "YouTubePublishing.c"
+static void ___lambda4_ (Block1Data* _data1_, GObject* obj, GAsyncResult* res) {
+	PublishingYouTubeUploadTransaction* self;
+	GMainLoop* _tmp3_ = NULL;
+	GError * _inner_error_ = NULL;
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	self = _data1_->self;
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_return_if_fail ((obj == NULL) || G_IS_OBJECT (obj));
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_return_if_fail (G_IS_ASYNC_RESULT (res));
+#line 3139 "YouTubePublishing.c"
+	{
+		GAsyncResult* _tmp0_ = NULL;
+#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp0_ = res;
+#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		publishing_you_tube_upload_transaction_splice_with_progress_finish (self, _tmp0_, &_inner_error_);
+#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 3148 "YouTubePublishing.c"
+			goto __catch22_g_error;
+		}
+	}
+	goto __finally22;
+	__catch22_g_error:
+	{
+		GError* _error_ = NULL;
+		GError* _tmp1_ = NULL;
+		const gchar* _tmp2_ = NULL;
+#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_error_ = _inner_error_;
+#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_inner_error_ = NULL;
+#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp1_ = _error_;
+#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp2_ = _tmp1_->message;
+#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		g_critical ("YouTubePublishing.vala:451: Failed to upload: %s", _tmp2_);
+#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_g_error_free0 (_error_);
+#line 3170 "YouTubePublishing.c"
+	}
+	__finally22:
+#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.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 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		g_clear_error (&_inner_error_);
+#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		return;
+#line 3181 "YouTubePublishing.c"
+	}
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp3_ = _data1_->loop;
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_main_loop_quit (_tmp3_);
+#line 3187 "YouTubePublishing.c"
 }
 
 
-static void _vala_SoupMultipart_free (SoupMultipart* self) {
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_boxed_free (soup_multipart_get_type (), self);
-#line 3736 "YouTubePublishing.c"
+static void ____lambda4__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) {
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	___lambda4_ (self, source_object, res);
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	block1_data_unref (self);
+#line 3196 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) {
 	PublishingYouTubeUploadTransaction * self;
-	SoupMultipart* message_parts = NULL;
-	SoupMultipart* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	PublishingYouTubePublishingParameters* _tmp2_ = NULL;
-	PublishingYouTubePrivacySetting _tmp3_ = 0;
-	gchar* unlisted_video = NULL;
+	GDataYouTubeVideo* video = NULL;
+	GDataYouTubeVideo* _tmp0_ = NULL;
+	gchar* slug = NULL;
+	SpitPublishingPublishable* _tmp1_ = NULL;
+	gchar* _tmp2_ = NULL;
+	gchar* title = NULL;
+	SpitPublishingPublishable* _tmp3_ = NULL;
 	gchar* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
-	PublishingYouTubePublishingParameters* _tmp6_ = NULL;
-	PublishingYouTubePrivacySetting _tmp7_ = 0;
-	gchar* private_video = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* title = NULL;
-	SpitPublishingPublishable* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	gchar* metadata = NULL;
-	const gchar* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
-	const gchar* _tmp17_ = NULL;
-	const gchar* _tmp18_ = NULL;
-	gchar* _tmp19_ = NULL;
-	gchar* _tmp20_ = NULL;
-	SoupBuffer* metadata_buffer = NULL;
-	const gchar* _tmp21_ = NULL;
-	guint8* _tmp22_ = NULL;
-	gint _tmp22__length1 = 0;
-	guint8* _tmp23_ = NULL;
-	gint _tmp23__length1 = 0;
-	SoupBuffer* _tmp24_ = NULL;
-	SoupMultipart* _tmp25_ = NULL;
-	SoupBuffer* _tmp26_ = NULL;
-	gchar* video_data = NULL;
-	gsize data_length = 0UL;
-	SoupBuffer* bindable_data = NULL;
-	const gchar* _tmp46_ = NULL;
-	guint8* _tmp47_ = NULL;
-	gint _tmp47__length1 = 0;
-	guint8* _tmp48_ = NULL;
-	gint _tmp48__length1 = 0;
-	gsize _tmp49_ = 0UL;
-	SoupBuffer* _tmp50_ = NULL;
-	SoupMultipart* _tmp51_ = NULL;
-	SpitPublishingPublishable* _tmp52_ = NULL;
-	GFile* _tmp53_ = NULL;
-	GFile* _tmp54_ = NULL;
-	gchar* _tmp55_ = NULL;
-	gchar* _tmp56_ = NULL;
-	SoupMessage* outbound_message = NULL;
-	gchar* _tmp57_ = NULL;
-	gchar* _tmp58_ = NULL;
-	SoupMultipart* _tmp59_ = NULL;
-	SoupMessage* _tmp60_ = NULL;
-	SoupMessage* _tmp61_ = NULL;
-	SoupMessageHeaders* _tmp62_ = NULL;
-	gchar* _tmp63_ = NULL;
-	gchar* _tmp64_ = NULL;
-	SoupMessageHeaders* _tmp65_ = NULL;
-	SpitPublishingPublishable* _tmp66_ = NULL;
-	gchar* _tmp67_ = NULL;
-	gchar* _tmp68_ = NULL;
-	SoupMessageHeaders* _tmp69_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp70_ = NULL;
-	gchar* _tmp71_ = NULL;
-	gchar* _tmp72_ = NULL;
-	gchar* _tmp73_ = NULL;
-	gchar* _tmp74_ = NULL;
+	GDataYouTubeVideo* _tmp8_ = NULL;
+	const gchar* _tmp9_ = NULL;
+	GDataYouTubeVideo* _tmp10_ = NULL;
+	PublishingYouTubePublishingParameters* _tmp11_ = NULL;
+	PublishingYouTubePrivacySetting _tmp12_ = 0;
+	PublishingYouTubePublishingParameters* _tmp13_ = NULL;
+	PublishingYouTubePrivacySetting _tmp14_ = 0;
+	GFile* file = NULL;
+	SpitPublishingPublishable* _tmp20_ = NULL;
+	GFile* _tmp21_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_UPLOAD_TRANSACTION, PublishingYouTubeUploadTransaction);
-#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp0_ = soup_multipart_new ("multipart/related");
-#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	message_parts = _tmp0_;
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp2_ = self->priv->parameters;
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp3_ = publishing_you_tube_publishing_parameters_get_privacy (_tmp2_);
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	if (_tmp3_ == PUBLISHING_YOU_TUBE_PRIVACY_SETTING_UNLISTED) {
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp1_ = PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_UNLISTED_XML;
-#line 3825 "YouTubePublishing.c"
-	} else {
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp1_ = "";
-#line 3829 "YouTubePublishing.c"
+#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp0_ = gdata_youtube_video_new (NULL);
+#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	video = _tmp0_;
+#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp1_ = self->priv->publishable;
+#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp2_ = spit_publishing_publishable_get_param_string (_tmp1_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
+#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	slug = _tmp2_;
+#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp3_ = self->priv->publishable;
+#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp4_ = spit_publishing_publishable_get_publishing_name (_tmp3_);
+#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	title = _tmp4_;
+#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp5_ = title;
+#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	if (g_strcmp0 (_tmp5_, "") == 0) {
+#line 3244 "YouTubePublishing.c"
+		SpitPublishingPublishable* _tmp6_ = NULL;
+		gchar* _tmp7_ = NULL;
+#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp6_ = self->priv->publishable;
+#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp7_ = spit_publishing_publishable_get_param_string (_tmp6_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
+#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_g_free0 (title);
+#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		title = _tmp7_;
+#line 3255 "YouTubePublishing.c"
 	}
-#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp4_ = g_strdup (_tmp1_);
-#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	unlisted_video = _tmp4_;
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp6_ = self->priv->parameters;
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp7_ = publishing_you_tube_publishing_parameters_get_privacy (_tmp6_);
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	if (_tmp7_ == PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PRIVATE) {
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp5_ = PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_PRIVATE_XML;
-#line 3843 "YouTubePublishing.c"
+#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp8_ = video;
+#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp9_ = title;
+#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	gdata_entry_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gdata_entry_get_type (), GDataEntry), _tmp9_);
+#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp10_ = video;
+#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp11_ = self->priv->parameters;
+#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp12_ = publishing_you_tube_publishing_parameters_get_privacy (_tmp11_);
+#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_object_set (_tmp10_, "is-private", _tmp12_ == PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PRIVATE, NULL);
+#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp13_ = self->priv->parameters;
+#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp14_ = publishing_you_tube_publishing_parameters_get_privacy (_tmp13_);
+#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	if (_tmp14_ == PUBLISHING_YOU_TUBE_PRIVACY_SETTING_UNLISTED) {
+#line 3277 "YouTubePublishing.c"
+		GDataYouTubeVideo* _tmp15_ = NULL;
+#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp15_ = video;
+#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		gdata_youtube_video_set_access_control (_tmp15_, "list", GDATA_YOUTUBE_PERMISSION_DENIED);
+#line 3283 "YouTubePublishing.c"
 	} else {
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp5_ = "";
-#line 3847 "YouTubePublishing.c"
-	}
-#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp8_ = g_strdup (_tmp5_);
-#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	private_video = _tmp8_;
-#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp9_ = self->priv->publishable;
-#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp10_ = spit_publishing_publishable_get_publishing_name (_tmp9_);
-#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	title = _tmp10_;
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp11_ = title;
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	if (g_strcmp0 (_tmp11_, "") == 0) {
-#line 3863 "YouTubePublishing.c"
-		SpitPublishingPublishable* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
-#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp12_ = self->priv->publishable;
-#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp13_ = spit_publishing_publishable_get_param_string (_tmp12_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
-#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_g_free0 (title);
-#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		title = _tmp13_;
-#line 3874 "YouTubePublishing.c"
+		GDataYouTubeVideo* _tmp16_ = NULL;
+		gboolean _tmp17_ = FALSE;
+		gboolean _tmp18_ = FALSE;
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp16_ = video;
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		g_object_get (_tmp16_, "is-private", &_tmp17_, NULL);
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp18_ = _tmp17_;
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		if (!_tmp18_) {
+#line 3296 "YouTubePublishing.c"
+			GDataYouTubeVideo* _tmp19_ = NULL;
+#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			_tmp19_ = video;
+#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			gdata_youtube_video_set_access_control (_tmp19_, "list", GDATA_YOUTUBE_PERMISSION_ALLOWED);
+#line 3302 "YouTubePublishing.c"
+		}
 	}
-#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp14_ = title;
-#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp15_ = publishing_rest_support_decimal_entity_encode (_tmp14_);
-#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp16_ = _tmp15_;
-#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp17_ = private_video;
-#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp18_ = unlisted_video;
-#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp19_ = g_strdup_printf (PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_METADATA_TEMPLATE, _tmp16_, _tmp17_, _tmp18_);
-#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp20_ = _tmp19_;
-#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (_tmp16_);
-#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	metadata = _tmp20_;
-#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp21_ = metadata;
-#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp22_ = string_get_data (_tmp21_, &_tmp22__length1);
-#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp23_ = _tmp22_;
-#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp23__length1 = _tmp22__length1;
-#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp24_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp23_, _tmp23__length1);
-#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	metadata_buffer = _tmp24_;
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp25_ = message_parts;
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp26_ = metadata_buffer;
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	soup_multipart_append_form_file (_tmp25_, "", "", "application/atom+xml", _tmp26_);
-#line 3912 "YouTubePublishing.c"
+#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp20_ = self->priv->publishable;
+#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp21_ = spit_publishing_publishable_get_serialized_file (_tmp20_);
+#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	file = _tmp21_;
+#line 3311 "YouTubePublishing.c"
 	{
-		SpitPublishingPublishable* _tmp27_ = NULL;
-		GFile* _tmp28_ = NULL;
-		GFile* _tmp29_ = NULL;
-		gchar* _tmp30_ = NULL;
-		gchar* _tmp31_ = NULL;
-		gchar* _tmp32_ = NULL;
-		gsize _tmp33_ = 0UL;
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp27_ = self->priv->publishable;
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp28_ = spit_publishing_publishable_get_serialized_file (_tmp27_);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp29_ = _tmp28_;
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp30_ = g_file_get_path (_tmp29_);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp31_ = _tmp30_;
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		g_file_get_contents (_tmp31_, &_tmp32_, &_tmp33_, &_inner_error_);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_g_free0 (video_data);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		video_data = _tmp32_;
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		data_length = _tmp33_;
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_g_free0 (_tmp31_);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_g_object_unref0 (_tmp29_);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		Block1Data* _data1_;
+		GFileInfo* info = NULL;
+		GFile* _tmp22_ = NULL;
+		GFileInfo* _tmp23_ = NULL;
+		GDataUploadStream* upload_stream = NULL;
+		GDataYouTubeService* _tmp24_ = NULL;
+		GDataYouTubeVideo* _tmp25_ = NULL;
+		const gchar* _tmp26_ = NULL;
+		GFileInfo* _tmp27_ = NULL;
+		const gchar* _tmp28_ = NULL;
+		GDataUploadStream* _tmp29_ = NULL;
+		GFileInputStream* input_stream = NULL;
+		GFile* _tmp30_ = NULL;
+		GFileInputStream* _tmp31_ = NULL;
+		GMainLoop* _tmp32_ = NULL;
+		GFileInfo* _tmp33_ = NULL;
+		GFileInputStream* _tmp34_ = NULL;
+		GDataUploadStream* _tmp35_ = NULL;
+		GMainLoop* _tmp36_ = NULL;
+		GDataYouTubeVideo* _tmp37_ = NULL;
+		GDataYouTubeService* _tmp38_ = NULL;
+		GDataUploadStream* _tmp39_ = NULL;
+		GDataYouTubeVideo* _tmp40_ = NULL;
+		GDataYouTubeVideo* _tmp41_ = NULL;
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data1_ = g_slice_new0 (Block1Data);
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data1_->_ref_count_ = 1;
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data1_->self = publishing_rest_support_transaction_ref (self);
+#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp22_ = file;
+#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp23_ = g_file_query_info (_tmp22_, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE "," G_FILE_ATTRIBUTE_STANDARD_SIZE, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_);
+#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		info = _tmp23_;
+#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			if (_inner_error_->domain == G_FILE_ERROR) {
-#line 3947 "YouTubePublishing.c"
-				goto __catch31_g_file_error;
-			}
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (video_data);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			__vala_SoupBuffer_free0 (metadata_buffer);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (metadata);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (title);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (private_video);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (unlisted_video);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			__vala_SoupMultipart_free0 (message_parts);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.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 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			g_clear_error (&_inner_error_);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			return;
-#line 3970 "YouTubePublishing.c"
+#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			block1_data_unref (_data1_);
+#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			_data1_ = NULL;
+#line 3355 "YouTubePublishing.c"
+			goto __catch21_g_error;
+		}
+#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp24_ = self->priv->youtube_service;
+#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp25_ = video;
+#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp26_ = slug;
+#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp27_ = info;
+#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp28_ = g_file_info_get_content_type (_tmp27_);
+#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp29_ = gdata_youtube_service_upload_video (_tmp24_, _tmp25_, _tmp26_, _tmp28_, NULL, &_inner_error_);
+#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		upload_stream = _tmp29_;
+#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			_g_object_unref0 (info);
+#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			block1_data_unref (_data1_);
+#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			_data1_ = NULL;
+#line 3380 "YouTubePublishing.c"
+			goto __catch21_g_error;
+		}
+#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp30_ = file;
+#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp31_ = g_file_read (_tmp30_, NULL, &_inner_error_);
+#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		input_stream = _tmp31_;
+#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			_g_object_unref0 (upload_stream);
+#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			_g_object_unref0 (info);
+#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			block1_data_unref (_data1_);
+#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			_data1_ = NULL;
+#line 3399 "YouTubePublishing.c"
+			goto __catch21_g_error;
+		}
+#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp32_ = g_main_loop_new (NULL, FALSE);
+#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data1_->loop = _tmp32_;
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp33_ = info;
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp34_ = input_stream;
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp35_ = upload_stream;
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		publishing_you_tube_upload_transaction_splice_with_progress (self, _tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, g_input_stream_get_type (), GInputStream), G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, g_output_stream_get_type (), GOutputStream), ____lambda4__gasync_ready_callback, block1_data_ref (_data1_));
+#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp36_ = _data1_->loop;
+#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		g_main_loop_run (_tmp36_);
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp38_ = self->priv->youtube_service;
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp39_ = upload_stream;
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp40_ = gdata_youtube_service_finish_video_upload (_tmp38_, _tmp39_, &_inner_error_);
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp37_ = _tmp40_;
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			_g_object_unref0 (input_stream);
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			_g_object_unref0 (upload_stream);
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			_g_object_unref0 (info);
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			block1_data_unref (_data1_);
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			_data1_ = NULL;
+#line 3438 "YouTubePublishing.c"
+			goto __catch21_g_error;
 		}
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp41_ = _tmp37_;
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp37_ = NULL;
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_g_object_unref0 (video);
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		video = _tmp41_;
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_g_object_unref0 (_tmp37_);
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_g_object_unref0 (input_stream);
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_g_object_unref0 (upload_stream);
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_g_object_unref0 (info);
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		block1_data_unref (_data1_);
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data1_ = NULL;
+#line 3461 "YouTubePublishing.c"
 	}
-	goto __finally31;
-	__catch31_g_file_error:
+	goto __finally21;
+	__catch21_g_error:
 	{
-		GError* e = NULL;
-		gchar* msg = NULL;
-		SpitPublishingPublishable* _tmp34_ = NULL;
-		GFile* _tmp35_ = NULL;
-		GFile* _tmp36_ = NULL;
-		gchar* _tmp37_ = NULL;
-		gchar* _tmp38_ = NULL;
-		GError* _tmp39_ = NULL;
-		const gchar* _tmp40_ = NULL;
-		gchar* _tmp41_ = NULL;
-		gchar* _tmp42_ = NULL;
+		GError* _error_ = NULL;
+		GError* _tmp42_ = NULL;
 		const gchar* _tmp43_ = NULL;
-		const gchar* _tmp44_ = NULL;
-		GError* _tmp45_ = NULL;
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		e = _inner_error_;
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_error_ = _inner_error_;
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_inner_error_ = NULL;
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp34_ = self->priv->publishable;
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp35_ = spit_publishing_publishable_get_serialized_file (_tmp34_);
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp36_ = _tmp35_;
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp37_ = g_file_get_path (_tmp36_);
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp38_ = _tmp37_;
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp39_ = e;
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp40_ = _tmp39_->message;
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp41_ = g_strdup_printf ("YouTube: couldn't read data from %s: %s", _tmp38_, _tmp40_);
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp42_ = _tmp41_;
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_g_free0 (_tmp38_);
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_g_object_unref0 (_tmp36_);
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		msg = _tmp42_;
-#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp43_ = msg;
-#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		g_warning ("YouTubePublishing.vala:580: %s", _tmp43_);
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp44_ = msg;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp45_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp44_);
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_inner_error_ = _tmp45_;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_g_free0 (msg);
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_g_error_free0 (e);
-#line 4032 "YouTubePublishing.c"
-		goto __finally31;
+#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp42_ = _error_;
+#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp43_ = _tmp42_->message;
+#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		g_critical ("YouTubePublishing.vala:458: Upload failed: %s", _tmp43_);
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_g_error_free0 (_error_);
+#line 3481 "YouTubePublishing.c"
 	}
-	__finally31:
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	__finally21:
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			g_propagate_error (error, _inner_error_);
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (video_data);
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			__vala_SoupBuffer_free0 (metadata_buffer);
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (metadata);
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			_g_object_unref0 (file);
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_g_free0 (title);
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (private_video);
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (unlisted_video);
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			__vala_SoupMultipart_free0 (message_parts);
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			_g_free0 (slug);
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			_g_object_unref0 (video);
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			return;
-#line 4058 "YouTubePublishing.c"
+#line 3500 "YouTubePublishing.c"
 		} else {
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (video_data);
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			__vala_SoupBuffer_free0 (metadata_buffer);
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (metadata);
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			_g_object_unref0 (file);
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_g_free0 (title);
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (private_video);
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (unlisted_video);
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			__vala_SoupMultipart_free0 (message_parts);
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			_g_free0 (slug);
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			_g_object_unref0 (video);
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.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 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			return;
-#line 4080 "YouTubePublishing.c"
+#line 3516 "YouTubePublishing.c"
 		}
 	}
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp46_ = video_data;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp47_ = string_get_data (_tmp46_, &_tmp47__length1);
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp48_ = _tmp47_;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp48__length1 = _tmp47__length1;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp49_ = data_length;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp50_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp48_ + 0, ((gint) _tmp49_) - 0);
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	bindable_data = _tmp50_;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp51_ = message_parts;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp52_ = self->priv->publishable;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp53_ = spit_publishing_publishable_get_serialized_file (_tmp52_);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp54_ = _tmp53_;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp55_ = g_file_get_path (_tmp54_);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp56_ = _tmp55_;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	soup_multipart_append_form_file (_tmp51_, "", _tmp56_, "video/mpeg", bindable_data);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (_tmp56_);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_object_unref0 (_tmp54_);
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp57_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp58_ = _tmp57_;
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp59_ = message_parts;
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp60_ = soup_form_request_new_from_multipart (_tmp58_, _tmp59_);
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp61_ = _tmp60_;
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (_tmp58_);
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	outbound_message = _tmp61_;
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp62_ = outbound_message->request_headers;
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp63_ = g_strdup_printf ("key=%s", PUBLISHING_YOU_TUBE_DEVELOPER_KEY);
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp64_ = _tmp63_;
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	soup_message_headers_append (_tmp62_, "X-GData-Key", _tmp64_);
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (_tmp64_);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp65_ = outbound_message->request_headers;
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp66_ = self->priv->publishable;
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp67_ = spit_publishing_publishable_get_param_string (_tmp66_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp68_ = _tmp67_;
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	soup_message_headers_append (_tmp65_, "Slug", _tmp68_);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (_tmp68_);
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp69_ = outbound_message->request_headers;
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp70_ = self->priv->session;
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp71_ = publishing_rest_support_google_session_get_access_token (_tmp70_);
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp72_ = _tmp71_;
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp73_ = g_strconcat ("Bearer ", _tmp72_, NULL);
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp74_ = _tmp73_;
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	soup_message_headers_append (_tmp69_, "Authorization", _tmp74_);
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (_tmp74_);
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (_tmp72_);
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), outbound_message);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	publishing_rest_support_transaction_set_is_executed (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), TRUE);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	publishing_rest_support_transaction_send (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			g_propagate_error (error, _inner_error_);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_object_unref0 (outbound_message);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			__vala_SoupBuffer_free0 (bindable_data);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (video_data);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			__vala_SoupBuffer_free0 (metadata_buffer);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (metadata);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (title);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (private_video);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (unlisted_video);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			__vala_SoupMultipart_free0 (message_parts);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			return;
-#line 4201 "YouTubePublishing.c"
+#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (file);
+#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_free0 (title);
+#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_free0 (slug);
+#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (video);
+#line 3527 "YouTubePublishing.c"
+}
+
+
+static void publishing_you_tube_upload_transaction_splice_with_progress_data_free (gpointer _data) {
+	PublishingYouTubeUploadTransactionSpliceWithProgressData* _data_;
+	_data_ = _data;
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (_data_->info);
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (_data_->input);
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (_data_->output);
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_publishing_rest_support_transaction_unref0 (_data_->self);
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_slice_free (PublishingYouTubeUploadTransactionSpliceWithProgressData, _data_);
+#line 3544 "YouTubePublishing.c"
+}
+
+
+static gpointer _publishing_rest_support_transaction_ref0 (gpointer self) {
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	return self ? publishing_rest_support_transaction_ref (self) : NULL;
+#line 3551 "YouTubePublishing.c"
+}
+
+
+static void publishing_you_tube_upload_transaction_splice_with_progress (PublishingYouTubeUploadTransaction* self, GFileInfo* info, GInputStream* input, GOutputStream* output, GAsyncReadyCallback _callback_, gpointer _user_data_) {
+	PublishingYouTubeUploadTransactionSpliceWithProgressData* _data_;
+	PublishingYouTubeUploadTransaction* _tmp0_ = NULL;
+	GFileInfo* _tmp1_ = NULL;
+	GFileInfo* _tmp2_ = NULL;
+	GInputStream* _tmp3_ = NULL;
+	GInputStream* _tmp4_ = NULL;
+	GOutputStream* _tmp5_ = NULL;
+	GOutputStream* _tmp6_ = NULL;
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_ = g_slice_new0 (PublishingYouTubeUploadTransactionSpliceWithProgressData);
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->_async_result = g_simple_async_result_new (NULL, _callback_, _user_data_, publishing_you_tube_upload_transaction_splice_with_progress);
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, publishing_you_tube_upload_transaction_splice_with_progress_data_free);
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp0_ = _publishing_rest_support_transaction_ref0 (self);
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->self = _tmp0_;
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp1_ = info;
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp2_ = _g_object_ref0 (_tmp1_);
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (_data_->info);
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->info = _tmp2_;
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp3_ = input;
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp4_ = _g_object_ref0 (_tmp3_);
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (_data_->input);
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->input = _tmp4_;
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp5_ = output;
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp6_ = _g_object_ref0 (_tmp5_);
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (_data_->output);
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->output = _tmp6_;
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	publishing_you_tube_upload_transaction_splice_with_progress_co (_data_);
+#line 3600 "YouTubePublishing.c"
+}
+
+
+static void publishing_you_tube_upload_transaction_splice_with_progress_finish (PublishingYouTubeUploadTransaction* self, GAsyncResult* _res_, GError** error) {
+	PublishingYouTubeUploadTransactionSpliceWithProgressData* _data_;
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) {
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		return;
+#line 3610 "YouTubePublishing.c"
+	}
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_));
+#line 3614 "YouTubePublishing.c"
+}
+
+
+static void publishing_you_tube_upload_transaction_splice_with_progress_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) {
+	PublishingYouTubeUploadTransactionSpliceWithProgressData* _data_;
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_ = _user_data_;
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->_source_object_ = source_object;
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->_res_ = _res_;
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	publishing_you_tube_upload_transaction_splice_with_progress_co (_data_);
+#line 3628 "YouTubePublishing.c"
+}
+
+
+static gboolean publishing_you_tube_upload_transaction_splice_with_progress_co (PublishingYouTubeUploadTransactionSpliceWithProgressData* _data_) {
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	switch (_data_->_state_) {
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		case 0:
+#line 3637 "YouTubePublishing.c"
+		goto _state_0;
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		case 1:
+#line 3641 "YouTubePublishing.c"
+		goto _state_1;
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		case 2:
+#line 3645 "YouTubePublishing.c"
+		goto _state_2;
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		case 3:
+#line 3649 "YouTubePublishing.c"
+		goto _state_3;
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		case 4:
+#line 3653 "YouTubePublishing.c"
+		goto _state_4;
+		default:
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		g_assert_not_reached ();
+#line 3658 "YouTubePublishing.c"
+	}
+	_state_0:
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->_tmp0_ = NULL;
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->_tmp0_ = _data_->info;
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->_tmp1_ = 0LL;
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->_tmp1_ = g_file_info_get_size (_data_->_tmp0_);
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->total_bytes = _data_->_tmp1_;
+#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->_tmp2_ = 0LL;
+#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->_tmp2_ = _data_->total_bytes;
+#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->bytes_to_write = _data_->_tmp2_;
+#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	while (TRUE) {
+#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp3_ = 0LL;
+#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp3_ = _data_->bytes_to_write;
+#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		if (!(_data_->_tmp3_ > ((gint64) 0))) {
+#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			break;
+#line 3687 "YouTubePublishing.c"
+		}
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp4_ = NULL;
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp4_ = _data_->input;
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_state_ = 1;
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		g_input_stream_read_async (_data_->_tmp4_, _data_->buffer, (gsize) 8192, G_PRIORITY_DEFAULT, NULL, publishing_you_tube_upload_transaction_splice_with_progress_ready, _data_);
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		return FALSE;
+#line 3699 "YouTubePublishing.c"
+		_state_1:
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp5_ = 0L;
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp5_ = g_input_stream_read_finish (_data_->_tmp4_, _data_->_res_, &_data_->_inner_error_);
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->bytes_read = _data_->_tmp5_;
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_);
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			g_error_free (_data_->_inner_error_);
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			if (_data_->_state_ == 0) {
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+				g_simple_async_result_complete_in_idle (_data_->_async_result);
+#line 3717 "YouTubePublishing.c"
+			} else {
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+				g_simple_async_result_complete (_data_->_async_result);
+#line 3721 "YouTubePublishing.c"
+			}
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			g_object_unref (_data_->_async_result);
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			return FALSE;
+#line 3727 "YouTubePublishing.c"
+		}
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp6_ = 0L;
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp6_ = _data_->bytes_read;
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		if (_data_->_tmp6_ == ((gssize) 0)) {
+#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			break;
+#line 3737 "YouTubePublishing.c"
+		}
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp7_ = NULL;
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp7_ = _data_->output;
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp8_ = 0L;
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp8_ = _data_->bytes_read;
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_state_ = 2;
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		g_output_stream_write_async (_data_->_tmp7_, _data_->buffer + 0, (gsize) (((gint) _data_->_tmp8_) - 0), G_PRIORITY_DEFAULT, NULL, publishing_you_tube_upload_transaction_splice_with_progress_ready, _data_);
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		return FALSE;
+#line 3753 "YouTubePublishing.c"
+		_state_2:
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp9_ = 0L;
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp9_ = g_output_stream_write_finish (_data_->_tmp7_, _data_->_res_, &_data_->_inner_error_);
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->bytes_written = _data_->_tmp9_;
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_);
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			g_error_free (_data_->_inner_error_);
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			if (_data_->_state_ == 0) {
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+				g_simple_async_result_complete_in_idle (_data_->_async_result);
+#line 3771 "YouTubePublishing.c"
+			} else {
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+				g_simple_async_result_complete (_data_->_async_result);
+#line 3775 "YouTubePublishing.c"
+			}
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			g_object_unref (_data_->_async_result);
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			return FALSE;
+#line 3781 "YouTubePublishing.c"
+		}
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp10_ = 0LL;
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp10_ = _data_->bytes_to_write;
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp11_ = 0L;
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp11_ = _data_->bytes_written;
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->bytes_to_write = _data_->_tmp10_ - _data_->_tmp11_;
+#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp12_ = 0LL;
+#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp12_ = _data_->total_bytes;
+#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp13_ = 0LL;
+#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp13_ = _data_->bytes_to_write;
+#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp14_ = 0LL;
+#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp14_ = _data_->total_bytes;
+#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_data_->self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "chunk-transmitted", (gint) (_data_->_tmp12_ - _data_->_tmp13_), (gint) _data_->_tmp14_);
+#line 3807 "YouTubePublishing.c"
+	}
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->_tmp15_ = NULL;
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->_tmp15_ = _data_->output;
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->_state_ = 3;
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_output_stream_close_async (_data_->_tmp15_, G_PRIORITY_DEFAULT, NULL, publishing_you_tube_upload_transaction_splice_with_progress_ready, _data_);
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	return FALSE;
+#line 3819 "YouTubePublishing.c"
+	_state_3:
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_output_stream_close_finish (_data_->_tmp15_, _data_->_res_, &_data_->_inner_error_);
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_);
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		g_error_free (_data_->_inner_error_);
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		if (_data_->_state_ == 0) {
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			g_simple_async_result_complete_in_idle (_data_->_async_result);
+#line 3833 "YouTubePublishing.c"
 		} else {
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_object_unref0 (outbound_message);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			__vala_SoupBuffer_free0 (bindable_data);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (video_data);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			__vala_SoupBuffer_free0 (metadata_buffer);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (metadata);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (title);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (private_video);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (unlisted_video);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			__vala_SoupMultipart_free0 (message_parts);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.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 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			g_clear_error (&_inner_error_);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			return;
-#line 4227 "YouTubePublishing.c"
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			g_simple_async_result_complete (_data_->_async_result);
+#line 3837 "YouTubePublishing.c"
+		}
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		g_object_unref (_data_->_async_result);
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		return FALSE;
+#line 3843 "YouTubePublishing.c"
+	}
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->_tmp16_ = NULL;
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->_tmp16_ = _data_->input;
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->_state_ = 4;
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_input_stream_close_async (_data_->_tmp16_, G_PRIORITY_DEFAULT, NULL, publishing_you_tube_upload_transaction_splice_with_progress_ready, _data_);
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	return FALSE;
+#line 3855 "YouTubePublishing.c"
+	_state_4:
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_input_stream_close_finish (_data_->_tmp16_, _data_->_res_, &_data_->_inner_error_);
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_);
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		g_error_free (_data_->_inner_error_);
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		if (_data_->_state_ == 0) {
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			g_simple_async_result_complete_in_idle (_data_->_async_result);
+#line 3869 "YouTubePublishing.c"
+		} else {
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			g_simple_async_result_complete (_data_->_async_result);
+#line 3873 "YouTubePublishing.c"
 		}
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		g_object_unref (_data_->_async_result);
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		return FALSE;
+#line 3879 "YouTubePublishing.c"
 	}
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_object_unref0 (outbound_message);
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	__vala_SoupBuffer_free0 (bindable_data);
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (video_data);
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	__vala_SoupBuffer_free0 (metadata_buffer);
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (metadata);
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (title);
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (private_video);
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (unlisted_video);
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	__vala_SoupMultipart_free0 (message_parts);
-#line 4248 "YouTubePublishing.c"
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	if (_data_->_state_ == 0) {
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		g_simple_async_result_complete_in_idle (_data_->_async_result);
+#line 3885 "YouTubePublishing.c"
+	} else {
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		g_simple_async_result_complete (_data_->_async_result);
+#line 3889 "YouTubePublishing.c"
+	}
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_object_unref (_data_->_async_result);
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	return FALSE;
+#line 3895 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_upload_transaction_class_init (PublishingYouTubeUploadTransactionClass * klass) {
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_upload_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_you_tube_upload_transaction_finalize;
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingYouTubeUploadTransactionPrivate));
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_you_tube_upload_transaction_real_execute;
-#line 4261 "YouTubePublishing.c"
+#line 3908 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_upload_transaction_instance_init (PublishingYouTubeUploadTransaction * self) {
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv = PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_GET_PRIVATE (self);
-#line 4268 "YouTubePublishing.c"
+#line 3915 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_upload_transaction_finalize (PublishingRESTSupportTransaction* obj) {
 	PublishingYouTubeUploadTransaction * self;
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YOU_TUBE_TYPE_UPLOAD_TRANSACTION, PublishingYouTubeUploadTransaction);
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_you_tube_publishing_parameters_unref0 (self->priv->parameters);
-#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (self->priv->publishable);
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (self->priv->youtube_service);
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_you_tube_upload_transaction_parent_class)->finalize (obj);
-#line 4284 "YouTubePublishing.c"
+#line 3933 "YouTubePublishing.c"
 }
 
 
@@ -4330,115 +3952,132 @@ GType publishing_you_tube_upload_transaction_get_type (void) {
 }
 
 
-PublishingYouTubeUploader* publishing_you_tube_uploader_construct (GType object_type, PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingYouTubePublishingParameters* parameters) {
+PublishingYouTubeUploader* publishing_you_tube_uploader_construct (GType object_type, GDataYouTubeService* youtube_service, PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingYouTubePublishingParameters* parameters) {
 	PublishingYouTubeUploader* self = NULL;
 	PublishingRESTSupportGoogleSession* _tmp0_ = NULL;
 	SpitPublishingPublishable** _tmp1_ = NULL;
 	gint _tmp1__length1 = 0;
 	PublishingYouTubePublishingParameters* _tmp2_ = NULL;
 	PublishingYouTubePublishingParameters* _tmp3_ = NULL;
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	GDataYouTubeService* _tmp4_ = NULL;
+	GDataYouTubeService* _tmp5_ = NULL;
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_return_val_if_fail (GDATA_IS_YOUTUBE_SERVICE (youtube_service), NULL);
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_PARAMETERS (parameters), NULL);
-#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = session;
-#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1_ = publishables;
-#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1__length1 = publishables_length1;
-#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = (PublishingYouTubeUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp1__length1);
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp2_ = parameters;
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp3_ = _publishing_you_tube_publishing_parameters_ref0 (_tmp2_);
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_you_tube_publishing_parameters_unref0 (self->priv->parameters);
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->parameters = _tmp3_;
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp4_ = youtube_service;
+#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp5_ = _g_object_ref0 (_tmp4_);
+#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (self->priv->youtube_service);
+#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	self->priv->youtube_service = _tmp5_;
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self;
-#line 4329 "YouTubePublishing.c"
+#line 3990 "YouTubePublishing.c"
 }
 
 
-PublishingYouTubeUploader* publishing_you_tube_uploader_new (PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingYouTubePublishingParameters* parameters) {
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	return publishing_you_tube_uploader_construct (PUBLISHING_YOU_TUBE_TYPE_UPLOADER, session, publishables, publishables_length1, parameters);
-#line 4336 "YouTubePublishing.c"
+PublishingYouTubeUploader* publishing_you_tube_uploader_new (GDataYouTubeService* youtube_service, PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingYouTubePublishingParameters* parameters) {
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	return publishing_you_tube_uploader_construct (PUBLISHING_YOU_TUBE_TYPE_UPLOADER, youtube_service, session, publishables, publishables_length1, parameters);
+#line 3997 "YouTubePublishing.c"
 }
 
 
 static PublishingRESTSupportTransaction* publishing_you_tube_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable) {
 	PublishingYouTubeUploader * self;
 	PublishingRESTSupportTransaction* result = NULL;
-	PublishingRESTSupportSession* _tmp0_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp1_ = NULL;
-	PublishingYouTubePublishingParameters* _tmp2_ = NULL;
-	SpitPublishingPublishable* _tmp3_ = NULL;
+	GDataYouTubeService* _tmp0_ = NULL;
+	PublishingRESTSupportSession* _tmp1_ = NULL;
+	PublishingRESTSupportGoogleSession* _tmp2_ = NULL;
+	PublishingYouTubePublishingParameters* _tmp3_ = NULL;
 	SpitPublishingPublishable* _tmp4_ = NULL;
-	PublishingYouTubeUploadTransaction* _tmp5_ = NULL;
-	PublishingRESTSupportTransaction* _tmp6_ = NULL;
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	SpitPublishingPublishable* _tmp5_ = NULL;
+	PublishingYouTubeUploadTransaction* _tmp6_ = NULL;
+	PublishingRESTSupportTransaction* _tmp7_ = NULL;
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_UPLOADER, PublishingYouTubeUploader);
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp0_ = publishing_rest_support_batch_uploader_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_SESSION, PublishingRESTSupportGoogleSession);
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp2_ = self->priv->parameters;
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp3_ = publishing_rest_support_batch_uploader_get_current_publishable (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp4_ = _tmp3_;
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp5_ = publishing_you_tube_upload_transaction_new (_tmp1_, _tmp2_, _tmp4_);
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_object_unref0 (_tmp4_);
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_publishing_rest_support_session_unref0 (_tmp1_);
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	result = _tmp6_;
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp0_ = self->priv->youtube_service;
+#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp1_ = publishing_rest_support_batch_uploader_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
+#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_SESSION, PublishingRESTSupportGoogleSession);
+#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp3_ = self->priv->parameters;
+#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp4_ = publishing_rest_support_batch_uploader_get_current_publishable (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
+#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp5_ = _tmp4_;
+#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp6_ = publishing_you_tube_upload_transaction_new (_tmp0_, _tmp2_, _tmp3_, _tmp5_);
+#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
+#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (_tmp5_);
+#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_publishing_rest_support_session_unref0 (_tmp2_);
+#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	result = _tmp7_;
+#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 4376 "YouTubePublishing.c"
+#line 4040 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_uploader_class_init (PublishingYouTubeUploaderClass * klass) {
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_uploader_parent_class = g_type_class_peek_parent (klass);
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->finalize = publishing_you_tube_uploader_finalize;
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingYouTubeUploaderPrivate));
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = publishing_you_tube_uploader_real_create_transaction;
-#line 4389 "YouTubePublishing.c"
+#line 4053 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_uploader_instance_init (PublishingYouTubeUploader * self) {
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv = PUBLISHING_YOU_TUBE_UPLOADER_GET_PRIVATE (self);
-#line 4396 "YouTubePublishing.c"
+#line 4060 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_uploader_finalize (PublishingRESTSupportBatchUploader* obj) {
 	PublishingYouTubeUploader * self;
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YOU_TUBE_TYPE_UPLOADER, PublishingYouTubeUploader);
-#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_you_tube_publishing_parameters_unref0 (self->priv->parameters);
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (self->priv->youtube_service);
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_you_tube_uploader_parent_class)->finalize (obj);
-#line 4408 "YouTubePublishing.c"
+#line 4074 "YouTubePublishing.c"
 }
 
 
diff --git a/plugins/shotwell-publishing/YouTubePublishing.vala b/plugins/shotwell-publishing/YouTubePublishing.vala
index bf2399a..87f1959 100644
--- a/plugins/shotwell-publishing/YouTubePublishing.vala
+++ b/plugins/shotwell-publishing/YouTubePublishing.vala
@@ -54,10 +54,8 @@ public class YouTubeService : Object, Spit.Pluggable, Spit.Publishing.Service {
 
 namespace Publishing.YouTube {
 
-private const string SERVICE_WELCOME_MESSAGE =
-    _("You are not currently logged into YouTube.\n\nYou must have already signed up for a Google account and set it up for use with YouTube to continue. You can set up most accounts by using your browser to log into the YouTube site at least once.");
 private const string DEVELOPER_KEY =
-    "AI39si5VEpzWK0z-pzo4fonEj9E4driCpEs9lK8y3HJsbbebIIRWqW3bIyGr42bjQv-N3siAfqVoM8XNmtbbp5x2gpbjiSAMTQ";
+    "AIzaSyB6hLnm0n5j8Y6Bkvh9bz3i8ADM2bJdYeY";
     
 private enum PrivacySetting {
     PUBLIC,
@@ -67,12 +65,10 @@ private enum PrivacySetting {
 
 private class PublishingParameters {
     private PrivacySetting privacy;
-    private string? channel_name;
     private string? user_name;
 
     public PublishingParameters() {
         this.privacy = PrivacySetting.PRIVATE;
-        this.channel_name = null;
         this.user_name = null;
     }
 
@@ -84,14 +80,6 @@ private class PublishingParameters {
         this.privacy = privacy;
     }
     
-    public string? get_channel_name() {
-        return channel_name;
-    }
-    
-    public void set_channel_name(string? channel_name) {
-        this.channel_name = channel_name;
-    }
-    
     public string? get_user_name() {
         return user_name;
     }
@@ -101,34 +89,46 @@ private class PublishingParameters {
     }
 }
 
-public class YouTubePublisher : Publishing.RESTSupport.GooglePublisher {
-    private class ChannelDirectoryTransaction :
-        Publishing.RESTSupport.GooglePublisher.AuthenticatedTransaction {
-        private const string ENDPOINT_URL = "https://gdata.youtube.com/feeds/users/default";
+internal class YouTubeAuthorizer : GData.Authorizer, Object {
+    private RESTSupport.GoogleSession session;
+    private Spit.Publishing.Authenticator authenticator;
 
-        public ChannelDirectoryTransaction(Publishing.RESTSupport.GoogleSession session) {
-            base(session, ENDPOINT_URL, Publishing.RESTSupport.HttpMethod.GET);
-        }
+    public YouTubeAuthorizer(RESTSupport.GoogleSession session, Spit.Publishing.Authenticator authenticator) {
+        this.session = session;
+        this.authenticator = authenticator;
+    }
+
+    public bool is_authorized_for_domain(GData.AuthorizationDomain domain) {
+        return true;
+    }
 
-        public static string? validate_xml(Publishing.RESTSupport.XmlDocument doc) {
-            Xml.Node* document_root = doc.get_root_node();
-            if ((document_root->name == "feed") || (document_root->name == "entry"))
-                return null;
-            else
-                return "response root node isn't a <feed> or <entry>";
+    public void process_request(GData.AuthorizationDomain? domain,
+                                Soup.Message message) {
+        if (domain == null) {
+            return;
         }
+
+        var header = "Bearer %s".printf(session.get_access_token());
+        message.request_headers.replace("Authorization", header);
     }
-    
+
+    public bool refresh_authorization (GLib.Cancellable? cancellable = null) throws GLib.Error {
+        this.authenticator.refresh();
+        return true;
+    }
+}
+
+public class YouTubePublisher : Publishing.RESTSupport.GooglePublisher {
     private bool running;
-    private string? refresh_token;
     private PublishingParameters publishing_parameters;
     private Spit.Publishing.ProgressCallback? progress_reporter;
+    private Spit.Publishing.Authenticator authenticator;
+    private GData.YouTubeService youtube_service;
 
     public YouTubePublisher(Spit.Publishing.Service service, Spit.Publishing.PluginHost host) {
         base(service, host, "https://gdata.youtube.com/");
-        
+
         this.running = false;
-        this.refresh_token = host.get_config_string("refresh_token", null);
         this.publishing_parameters = new PublishingParameters();
         this.progress_reporter = null;
     }
@@ -144,13 +144,10 @@ public class YouTubePublisher : Publishing.RESTSupport.GooglePublisher {
             return;
 
         running = true;
-        
-        if (refresh_token == null)
-            do_show_service_welcome_pane();
-        else
-            start_oauth_flow(refresh_token);
+
+        this.authenticator.authenticate();
     }
-    
+
     public override void stop() {
         debug("YouTubePublisher: stopped.");
 
@@ -158,92 +155,15 @@ public class YouTubePublisher : Publishing.RESTSupport.GooglePublisher {
 
         get_session().stop_transactions();
     }
-    
-    private string extract_channel_name_helper(Xml.Node* document_root) throws
-        Spit.Publishing.PublishingError {
-        string result = "";
-
-        Xml.Node* doc_node_iter = null;
-        if (document_root->name == "feed")
-            doc_node_iter = document_root->children;
-        else if (document_root->name == "entry")
-            doc_node_iter = document_root;
-        else
-            throw new Spit.Publishing.PublishingError.MALFORMED_RESPONSE(
-                "response root node isn't a <feed> or <entry>");
-
-        for ( ; doc_node_iter != null; doc_node_iter = doc_node_iter->next) {
-            if (doc_node_iter->name != "entry")
-                continue;
-
-            string name_val = null;
-            string url_val = null;
-            Xml.Node* channel_node_iter = doc_node_iter->children;
-            for ( ; channel_node_iter != null; channel_node_iter = channel_node_iter->next) {
-                if (channel_node_iter->name == "title") {
-                    name_val = channel_node_iter->get_content();
-                } else if (channel_node_iter->name == "id") {
-                    // we only want nodes in the default namespace -- the feed that we get back
-                    // from Google also defines <entry> child nodes named <id> in the media
-                    // namespace
-                    if (channel_node_iter->ns->prefix != null)
-                        continue;
-                    url_val = channel_node_iter->get_content();
-                }
-            }
-
-            result = name_val;
-            break;
-        }
-
-        debug("YouTubePublisher: extracted channel name '%s' from response XML.", result);
-
-        return result;
-    }
-    
-    private void on_service_welcome_login() {
-        debug("EVENT: user clicked 'Login' in welcome pane.");
 
-        if (!is_running())
-            return;
-        
-        start_oauth_flow(refresh_token);
-    }
-    
     protected override void on_login_flow_complete() {
         debug("EVENT: OAuth login flow complete.");
         
-        get_host().set_config_string("refresh_token", get_session().get_refresh_token());
-
         publishing_parameters.set_user_name(get_session().get_user_name());
         
-        do_fetch_account_information();
-    }
-
-    private void on_initial_channel_fetch_complete(Publishing.RESTSupport.Transaction txn) {
-        txn.completed.disconnect(on_initial_channel_fetch_complete);
-        txn.network_error.disconnect(on_initial_channel_fetch_error);
-
-        debug("EVENT: finished fetching account and channel information.");
-
-        if (!is_running())
-            return;
-
-        do_parse_and_display_account_information((ChannelDirectoryTransaction) txn);
-    }
-
-    private void on_initial_channel_fetch_error(Publishing.RESTSupport.Transaction bad_txn,
-        Spit.Publishing.PublishingError err) {
-        bad_txn.completed.disconnect(on_initial_channel_fetch_complete);
-        bad_txn.network_error.disconnect(on_initial_channel_fetch_error);
-
-        debug("EVENT: fetching account and channel information failed; response = '%s'.",
-            bad_txn.get_response());
-
-        if (!is_running())
-            return;
-
-        get_host().post_error(err);
+        this.youtube_service = new GData.YouTubeService(DEVELOPER_KEY,
+                new YouTubeAuthorizer(get_session(), this.authenticator));
+        do_show_publishing_options_pane();
     }
 
     private void on_publishing_options_logout() {
@@ -301,53 +221,6 @@ public class YouTubePublisher : Publishing.RESTSupport.GooglePublisher {
         get_host().post_error(err);
     }
 
-    private void do_show_service_welcome_pane() {
-        debug("ACTION: showing service welcome pane.");
-
-        get_host().install_welcome_pane(SERVICE_WELCOME_MESSAGE, on_service_welcome_login);
-    }
-    
-    private void do_fetch_account_information() {
-        debug("ACTION: fetching channel information.");
-
-        get_host().install_account_fetch_wait_pane();
-        get_host().set_service_locked(true);
-
-        ChannelDirectoryTransaction directory_trans =
-            new ChannelDirectoryTransaction(get_session());
-        directory_trans.network_error.connect(on_initial_channel_fetch_error);
-        directory_trans.completed.connect(on_initial_channel_fetch_complete);
-
-        try {
-            directory_trans.execute();
-        } catch (Spit.Publishing.PublishingError err) {
-            on_initial_channel_fetch_error(directory_trans, err);
-        }
-    }
-
-    private void do_parse_and_display_account_information(ChannelDirectoryTransaction transaction) {
-        debug("ACTION: extracting account and channel information from body of server response");
-
-        Publishing.RESTSupport.XmlDocument response_doc;
-        try {
-            response_doc = Publishing.RESTSupport.XmlDocument.parse_string(
-                transaction.get_response(), ChannelDirectoryTransaction.validate_xml);
-        } catch (Spit.Publishing.PublishingError err) {
-            get_host().post_error(err);
-            return;
-        }
-
-        try {
-            publishing_parameters.set_channel_name(extract_channel_name_helper(
-                response_doc.get_root_node()));
-        } catch (Spit.Publishing.PublishingError err) {
-            get_host().post_error(err);
-            return;
-        }
-
-        do_show_publishing_options_pane();
-    }
-
     private void do_show_publishing_options_pane() {
         debug("ACTION: showing publishing options pane.");
 
@@ -364,8 +237,7 @@ public class YouTubePublisher : Publishing.RESTSupport.GooglePublisher {
             return;
         }
 
-        PublishingOptionsPane opts_pane = new PublishingOptionsPane(get_host(), builder,
-            publishing_parameters);
+        PublishingOptionsPane opts_pane = new PublishingOptionsPane(authenticator, get_host(), builder, publishing_parameters);
         opts_pane.publish.connect(on_publishing_options_publish);
         opts_pane.logout.connect(on_publishing_options_logout);
         get_host().install_dialog_pane(opts_pane);
@@ -378,7 +250,6 @@ public class YouTubePublisher : Publishing.RESTSupport.GooglePublisher {
 
         get_host().set_service_locked(true);
         get_host().install_account_fetch_wait_pane();
-        
 
         progress_reporter = get_host().serialize_publishables(-1);
 
@@ -390,7 +261,7 @@ public class YouTubePublisher : Publishing.RESTSupport.GooglePublisher {
             return;
 
         Spit.Publishing.Publishable[] publishables = get_host().get_publishables();
-        Uploader uploader = new Uploader(get_session(), publishables, publishing_parameters);
+        Uploader uploader = new Uploader(this.youtube_service, get_session(), publishables, publishing_parameters);
 
         uploader.upload_complete.connect(on_upload_complete);
         uploader.upload_error.connect(on_upload_error);
@@ -407,13 +278,20 @@ public class YouTubePublisher : Publishing.RESTSupport.GooglePublisher {
 
     protected override void do_logout() {
         debug("ACTION: logging out user.");
-        
-        get_session().deauthenticate();
-        refresh_token = null;
-        get_host().unset_config_key("refresh_token");
-          
 
-        do_show_service_welcome_pane();
+        if (this.authenticator.can_logout()) {
+            this.authenticator.logout();
+            this.authenticator.authenticate();
+        }
+    }
+
+    protected override Spit.Publishing.Authenticator get_authenticator() {
+        if (this.authenticator == null) {
+            this.authenticator =
+                Publishing.Authenticator.Factory.get_instance().create("youtube", get_host());
+        }
+
+        return this.authenticator;
     }
 }
 
@@ -433,7 +311,6 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
 
     private Gtk.Box pane_widget = null;
     private Gtk.ComboBoxText privacy_combo = null;
-    private Gtk.Label publish_to_label = null;
     private Gtk.Label login_identity_label = null;
     private Gtk.Button publish_button = null;
     private Gtk.Button logout_button = null;
@@ -442,8 +319,10 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
     private PrivacyDescription[] privacy_descriptions;
     private PublishingParameters publishing_parameters;
 
-    public PublishingOptionsPane(Spit.Publishing.PluginHost host, Gtk.Builder builder,
-        PublishingParameters publishing_parameters) {
+    public PublishingOptionsPane(Spit.Publishing.Authenticator authenticator,
+                                 Spit.Publishing.PluginHost host,
+                                 Gtk.Builder builder,
+                                 PublishingParameters publishing_parameters) {
         this.privacy_descriptions = create_privacy_descriptions();
         this.publishing_parameters = publishing_parameters;
 
@@ -453,16 +332,17 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
 
         login_identity_label = this.builder.get_object("login_identity_label") as Gtk.Label;
         privacy_combo = this.builder.get_object("privacy_combo") as Gtk.ComboBoxText;
-        publish_to_label = this.builder.get_object("publish_to_label") as Gtk.Label;
         publish_button = this.builder.get_object("publish_button") as Gtk.Button;
         logout_button = this.builder.get_object("logout_button") as Gtk.Button;
         pane_widget = this.builder.get_object("youtube_pane_widget") as Gtk.Box;
         privacy_label = this.builder.get_object("privacy_label") as Gtk.Label;
 
+        if (!authenticator.can_logout()) {
+            logout_button.parent.remove(logout_button);
+        }
+
         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(
-            publishing_parameters.get_channel_name()));
 
         foreach(PrivacyDescription desc in privacy_descriptions) {
             privacy_combo.append_text(desc.description);
@@ -519,107 +399,101 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
 
 internal class UploadTransaction : Publishing.RESTSupport.GooglePublisher.AuthenticatedTransaction {
     private const string ENDPOINT_URL = "https://uploads.gdata.youtube.com/feeds/api/users/default/uploads";
-    private const string UNLISTED_XML = "<yt:accessControl action='list' permission='denied'/>";
-    private const string PRIVATE_XML = "<yt:private/>";
-    private const string METADATA_TEMPLATE ="""<?xml version='1.0'?>
-                                                <entry xmlns='http://www.w3.org/2005/Atom'
-                                                xmlns:media='http://search.yahoo.com/mrss/'
-                                                xmlns:yt='http://gdata.youtube.com/schemas/2007'>
-                                                <media:group>
-                                                    <media:title type='plain'>%s</media:title>
-                                                    <media:category
-                                                    scheme='http://gdata.youtube.com/schemas/2007/categories.cat'>People
-                                                    </media:category>
-                                                    %s
-                                                </media:group>
-                                                    %s
-                                                </entry>""";
     private PublishingParameters parameters;
     private Publishing.RESTSupport.GoogleSession session;
     private Spit.Publishing.Publishable publishable;
+    private GData.YouTubeService youtube_service;
 
-    public UploadTransaction(Publishing.RESTSupport.GoogleSession session,
+    public UploadTransaction(GData.YouTubeService youtube_service, Publishing.RESTSupport.GoogleSession session,
         PublishingParameters parameters, Spit.Publishing.Publishable publishable) {
         base(session, ENDPOINT_URL, Publishing.RESTSupport.HttpMethod.POST);
         assert(session.is_authenticated());
         this.session = session;
         this.parameters = parameters;
         this.publishable = publishable;
+        this.youtube_service = youtube_service;
     }
 
     public override void execute() throws Spit.Publishing.PublishingError {
-        // create the multipart request container
-        Soup.Multipart message_parts = new Soup.Multipart("multipart/related");
-
-        string unlisted_video =
-            (parameters.get_privacy() == PrivacySetting.UNLISTED) ? UNLISTED_XML : "";
-
-        string private_video =
-            (parameters.get_privacy() == PrivacySetting.PRIVATE) ? PRIVATE_XML : "";
+        var video = new GData.YouTubeVideo(null);
 
+        var slug = publishable.get_param_string(Spit.Publishing.Publishable.PARAM_STRING_BASENAME);
         // Set title to publishing name, but if that's empty default to filename.
         string title = publishable.get_publishing_name();
         if (title == "") {
             title = publishable.get_param_string(Spit.Publishing.Publishable.PARAM_STRING_BASENAME);
         }
+        video.title = title;
+
+        video.is_private = (parameters.get_privacy() == PrivacySetting.PRIVATE);
+
+        if (parameters.get_privacy() == PrivacySetting.UNLISTED) {
+            video.set_access_control("list", GData.YouTubePermission.DENIED);
+        } else if (!video.is_private) {
+            video.set_access_control("list", GData.YouTubePermission.ALLOWED);
+        }
 
-        string metadata = METADATA_TEMPLATE.printf(Publishing.RESTSupport.decimal_entity_encode(title),
-            private_video, unlisted_video);
-        Soup.Buffer metadata_buffer = new Soup.Buffer(Soup.MemoryUse.COPY, metadata.data);
-        message_parts.append_form_file("", "", "application/atom+xml", metadata_buffer);
+        var file = publishable.get_serialized_file();
 
-        // attempt to read the binary video data from disk
-        string video_data;
-        size_t data_length;
         try {
-            FileUtils.get_contents(publishable.get_serialized_file().get_path(), out video_data,
-                out data_length);
-        } catch (FileError e) {
-            string msg = "YouTube: couldn't read data from %s: %s".printf(
-                publishable.get_serialized_file().get_path(), e.message);
-            warning("%s", msg);
-
-            throw new Spit.Publishing.PublishingError.LOCAL_FILE_ERROR(msg);
+            var info = file.query_info(FileAttribute.STANDARD_CONTENT_TYPE + "," +
+                                       FileAttribute.STANDARD_SIZE, FileQueryInfoFlags.NONE);
+            var upload_stream = this.youtube_service.upload_video(video, slug,
+                    info.get_content_type());
+            var input_stream = file.read();
+
+            // Yuck...
+            var loop = new MainLoop(null, false);
+            this.splice_with_progress.begin(info, input_stream, upload_stream, (obj, res) => {
+                try {
+                    this.splice_with_progress.end(res);
+                } catch (Error error) {
+                    critical("Failed to upload: %s", error.message);
+                }
+                loop.quit();
+            });
+            loop.run();
+            video = this.youtube_service.finish_video_upload(upload_stream);
+        } catch (Error error) {
+            critical("Upload failed: %s", error.message);
+        }
+    }
+
+    private async void splice_with_progress(GLib.FileInfo info, GLib.InputStream input, GLib.OutputStream output) throws Error {
+        var total_bytes = info.get_size();
+        var bytes_to_write = total_bytes;
+        uint8 buffer[8192];
+
+        while (bytes_to_write > 0) {
+            var bytes_read = yield input.read_async(buffer);
+            if (bytes_read == 0)
+                break;
+
+            var bytes_written = yield output.write_async(buffer[0:bytes_read]);
+            bytes_to_write -= bytes_written;
+            chunk_transmitted((int)(total_bytes - bytes_to_write), (int) total_bytes);
         }
 
-        // bind the binary video data read from disk into a Soup.Buffer object so that we
-        // can attach it to the multipart request, then actaully append the buffer
-        // to the multipart request. Then, set the MIME type for this part.
-        Soup.Buffer bindable_data = new Soup.Buffer(Soup.MemoryUse.COPY,
-            video_data.data[0:data_length]);
-
-        message_parts.append_form_file("", publishable.get_serialized_file().get_path(),
-            "video/mpeg", bindable_data);
-        // create a message that can be sent over the wire whose payload is the multipart container
-        // that we've been building up
-        Soup.Message outbound_message =
-            Soup.Form.request_new_from_multipart(get_endpoint_url(), message_parts);
-        outbound_message.request_headers.append("X-GData-Key", "key=%s".printf(DEVELOPER_KEY));
-        outbound_message.request_headers.append("Slug",
-            publishable.get_param_string(Spit.Publishing.Publishable.PARAM_STRING_BASENAME));
-        outbound_message.request_headers.append("Authorization", "Bearer " +
-            session.get_access_token());
-        set_message(outbound_message);
-
-        // send the message and get its response
-        set_is_executed(true);
-        send();
+        yield output.close_async();
+        yield input.close_async();
     }
 }
 
 internal class Uploader : Publishing.RESTSupport.BatchUploader {
     private PublishingParameters parameters;
+    private GData.YouTubeService youtube_service;
 
-    public Uploader(Publishing.RESTSupport.GoogleSession session,
+    public Uploader(GData.YouTubeService youtube_service, Publishing.RESTSupport.GoogleSession session,
         Spit.Publishing.Publishable[] publishables, PublishingParameters parameters) {
         base(session, publishables);
 
         this.parameters = parameters;
+        this.youtube_service = youtube_service;
     }
 
     protected override Publishing.RESTSupport.Transaction create_transaction(
         Spit.Publishing.Publishable publishable) {
-        return new UploadTransaction((Publishing.RESTSupport.GoogleSession) get_session(),
+        return new UploadTransaction(this.youtube_service, (Publishing.RESTSupport.GoogleSession) get_session(),
             parameters, get_current_publishable());
     }
 }
diff --git a/plugins/shotwell-publishing/flickr_pin_entry_pane.ui b/plugins/shotwell-publishing/flickr_pin_entry_pane.ui
deleted file mode 100644
index dd4c35c..0000000
--- a/plugins/shotwell-publishing/flickr_pin_entry_pane.ui
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
-<interface domain="shotwell">
-  <requires lib="gtk+" version="3.14"/>
-  <object class="GtkBox" id="pane_widget">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="orientation">vertical</property>
-    <child>
-      <object class="GtkLabel" id="explanatory_text">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_left">16</property>
-        <property name="margin_right">16</property>
-        <property name="margin_top">48</property>
-        <property name="margin_bottom">16</property>
-        <property name="label" translatable="yes">Enter the confirmation number which appears after you log into Flickr in your Web browser.</property>
-        <property name="angle">0.0099999997764825821</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkBox" id="box2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="halign">center</property>
-        <property name="margin_bottom">80</property>
-        <child>
-          <object class="GtkLabel" id="pin_entry_caption">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="halign">end</property>
-            <property name="label" translatable="yes">Authorization _Number:</property>
-            <property name="use_underline">True</property>
-            <property name="justify">right</property>
-            <property name="mnemonic_widget">pin_entry</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="pin_entry">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="margin_left">8</property>
-            <property name="invisible_char">●</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkButton" id="continue_button">
-        <property name="label" translatable="yes">Con_tinue</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
-        <property name="margin_left">240</property>
-        <property name="margin_right">240</property>
-        <property name="margin_bottom">160</property>
-        <property name="use_underline">True</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="pack_type">end</property>
-        <property name="position">2</property>
-      </packing>
-    </child>
-    <child>
-      <placeholder/>
-    </child>
-  </object>
-</interface>
diff --git a/plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml b/plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml
index af3baad..b09902e 100644
--- a/plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml
+++ b/plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml
@@ -7,7 +7,6 @@
       <file>piwigo.png</file>
       <file>youtube.png</file>
       <file>facebook_publishing_options_pane.ui</file>
-      <file>flickr_pin_entry_pane.ui</file>
       <file>flickr_publishing_options_pane.ui</file>
       <file>picasa_publishing_options_pane.ui</file>
       <file>piwigo_authentication_pane.ui</file>
diff --git a/plugins/shotwell-publishing/picasa_publishing_options_pane.ui b/plugins/shotwell-publishing/picasa_publishing_options_pane.ui
index 04d3948..11e79af 100644
--- a/plugins/shotwell-publishing/picasa_publishing_options_pane.ui
+++ b/plugins/shotwell-publishing/picasa_publishing_options_pane.ui
@@ -16,7 +16,7 @@
         <property name="can_focus">False</property>
         <property name="margin_top">12</property>
         <property name="margin_bottom">32</property>
-        <property name="label">'you are logged in as $name'
+        <property name="label" translatable="no">'you are logged in as $name'
 (populated in the application code)</property>
       </object>
       <packing>
@@ -51,66 +51,25 @@
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="new_album_entry">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="invisible_char">•</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkRadioButton" id="use_existing_radio">
-                <property name="label" translatable="yes">An _existing album:</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="halign">start</property>
-                <property name="use_underline">True</property>
-                <property name="active">True</property>
-                <property name="draw_indicator">True</property>
-                <property name="group">create_new_radio</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkRadioButton" id="create_new_radio">
-                <property name="label" translatable="yes">A _new album named:</property>
+              <object class="GtkCheckButton" id="strip_metadata_check">
+                <property name="label" translatable="yes">_Remove location, camera, and other identifying information before uploading</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
                 <property name="halign">start</property>
+                <property name="margin_top">16</property>
+                <property name="hexpand">True</property>
                 <property name="use_underline">True</property>
-                <property name="active">True</property>
                 <property name="draw_indicator">True</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkCheckButton" id="public_check">
-                <property name="label" translatable="yes">L_ist album in public gallery</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="halign">start</property>
-                <property name="use_underline">True</property>
-                <property name="draw_indicator">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">3</property>
+                <property name="width">2</property>
               </packing>
             </child>
             <child>
@@ -118,14 +77,12 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
-                <property name="margin_top">32</property>
-                <property name="label">$mediatype will appear in
+                <property name="label" translatable="no">$mediatype will appear in
 (populated in code)</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">0</property>
-                <property name="width">2</property>
               </packing>
             </child>
             <child>
@@ -133,48 +90,25 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
-                <property name="margin_top">32</property>
                 <property name="label" translatable="yes">Photo _size preset:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">size_combo</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
-                <property name="top_attach">4</property>
+                <property name="top_attach">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkComboBoxText" id="size_combo">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="margin_top">32</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="top_attach">4</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkCheckButton" id="strip_metadata_check">
-                <property name="label" translatable="yes">_Remove location, camera, and other identifying information before uploading</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="halign">start</property>
-                <property name="margin_top">16</property>
-                <property name="hexpand">True</property>
-                <property name="use_underline">True</property>
-                <property name="draw_indicator">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">5</property>
-                <property name="width">2</property>
+                <property name="top_attach">1</property>
               </packing>
             </child>
-            <child>
-              <placeholder/>
-            </child>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/plugins/shotwell-publishing/shotwell-publishing.c b/plugins/shotwell-publishing/shotwell-publishing.c
index 7886a92..98b3abd 100644
--- a/plugins/shotwell-publishing/shotwell-publishing.c
+++ b/plugins/shotwell-publishing/shotwell-publishing.c
@@ -11,6 +11,8 @@
 #include <glib-object.h>
 #include <shotwell-plugin-dev-1.0.h>
 #include <gio/gio.h>
+#include "shotwell-authenticator.h"
+#include <gee.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib/gi18n-lib.h>
@@ -26,6 +28,7 @@
 typedef struct _ShotwellPublishingCoreServices ShotwellPublishingCoreServices;
 typedef struct _ShotwellPublishingCoreServicesClass ShotwellPublishingCoreServicesClass;
 typedef struct _ShotwellPublishingCoreServicesPrivate ShotwellPublishingCoreServicesPrivate;
+#define _g_free0(var) (var = (g_free (var), NULL))
 
 #define TYPE_FACEBOOK_SERVICE (facebook_service_get_type ())
 #define FACEBOOK_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_FACEBOOK_SERVICE, FacebookService))
@@ -135,87 +138,87 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify
 
 
 static void _vala_array_add1 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) {
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if ((*length) == (*size)) {
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 145 "shotwell-publishing.c"
+#line 148 "shotwell-publishing.c"
 	}
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[(*length)++] = value;
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[*length] = NULL;
-#line 151 "shotwell-publishing.c"
+#line 154 "shotwell-publishing.c"
 }
 
 
 static void _vala_array_add2 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) {
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if ((*length) == (*size)) {
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 162 "shotwell-publishing.c"
+#line 165 "shotwell-publishing.c"
 	}
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[(*length)++] = value;
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[*length] = NULL;
-#line 168 "shotwell-publishing.c"
+#line 171 "shotwell-publishing.c"
 }
 
 
 static void _vala_array_add3 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) {
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if ((*length) == (*size)) {
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 179 "shotwell-publishing.c"
+#line 182 "shotwell-publishing.c"
 	}
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[(*length)++] = value;
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[*length] = NULL;
-#line 185 "shotwell-publishing.c"
+#line 188 "shotwell-publishing.c"
 }
 
 
 static void _vala_array_add4 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) {
-#line 21 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if ((*length) == (*size)) {
-#line 21 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 21 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 196 "shotwell-publishing.c"
+#line 199 "shotwell-publishing.c"
 	}
-#line 21 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[(*length)++] = value;
-#line 21 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[*length] = NULL;
-#line 202 "shotwell-publishing.c"
+#line 205 "shotwell-publishing.c"
 }
 
 
 static void _vala_array_add5 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) {
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if ((*length) == (*size)) {
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 213 "shotwell-publishing.c"
+#line 216 "shotwell-publishing.c"
 	}
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[(*length)++] = value;
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[*length] = NULL;
-#line 219 "shotwell-publishing.c"
+#line 222 "shotwell-publishing.c"
 }
 
 
@@ -224,21 +227,29 @@ ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GTy
 	GFile* resource_directory = NULL;
 	GFile* _tmp0_ = NULL;
 	GFile* _tmp1_ = NULL;
-	SpitPluggable** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	FacebookService* _tmp3_ = NULL;
-	SpitPluggable** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	PicasaService* _tmp5_ = NULL;
-	SpitPluggable** _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	FlickrService* _tmp7_ = NULL;
-	SpitPluggable** _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
-	YouTubeService* _tmp9_ = NULL;
-	SpitPluggable** _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
-	PiwigoService* _tmp11_ = NULL;
+	PublishingAuthenticatorFactory* factory = NULL;
+	PublishingAuthenticatorFactory* _tmp2_ = NULL;
+	GeeList* authenicators = NULL;
+	PublishingAuthenticatorFactory* _tmp3_ = NULL;
+	GeeList* _tmp4_ = NULL;
+	GFile* _tmp5_ = NULL;
+	gchar* _tmp6_ = NULL;
+	gchar* _tmp7_ = NULL;
+	GeeList* _tmp8_ = NULL;
+	gint _tmp9_ = 0;
+	gint _tmp10_ = 0;
+	GeeList* _tmp11_ = NULL;
+	gboolean _tmp12_ = FALSE;
+	GeeList* _tmp16_ = NULL;
+	gboolean _tmp17_ = FALSE;
+	GeeList* _tmp21_ = NULL;
+	gboolean _tmp22_ = FALSE;
+	GeeList* _tmp26_ = NULL;
+	gboolean _tmp27_ = FALSE;
+	SpitPluggable** _tmp31_ = NULL;
+	gint _tmp31__length1 = 0;
+	GFile* _tmp32_ = NULL;
+	PiwigoService* _tmp33_ = NULL;
 #line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	g_return_val_if_fail (G_IS_FILE (module_file), NULL);
 #line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
@@ -249,58 +260,152 @@ ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GTy
 	_tmp1_ = g_file_get_parent (_tmp0_);
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	resource_directory = _tmp1_;
+#line 17 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp2_ = publishing_authenticator_factory_get_instance ();
+#line 17 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	factory = _tmp2_;
 #line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp2_ = self->priv->pluggables;
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp2__length1 = self->priv->pluggables_length1;
+	_tmp3_ = factory;
 #line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp3_ = facebook_service_new (resource_directory);
+	_tmp4_ = spit_publishing_authenticator_factory_get_available_authenticators (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY, SpitPublishingAuthenticatorFactory));
 #line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_vala_array_add1 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp4_ = self->priv->pluggables;
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp4__length1 = self->priv->pluggables_length1;
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp5_ = picasa_service_new (resource_directory);
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_vala_array_add2 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp6_ = self->priv->pluggables;
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp6__length1 = self->priv->pluggables_length1;
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp7_ = flickr_service_new (resource_directory);
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_vala_array_add3 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 21 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp8_ = self->priv->pluggables;
-#line 21 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp8__length1 = self->priv->pluggables_length1;
-#line 21 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp9_ = you_tube_service_new (resource_directory);
-#line 21 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_vala_array_add4 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+	authenicators = _tmp4_;
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp10_ = self->priv->pluggables;
+	_tmp5_ = resource_directory;
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp10__length1 = self->priv->pluggables_length1;
+	_tmp6_ = g_file_get_path (_tmp5_);
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp11_ = piwigo_service_new (resource_directory);
+	_tmp7_ = _tmp6_;
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_vala_array_add5 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+	g_debug ("shotwell-publishing.vala:22: Looking for resources in %s", _tmp7_);
+#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_g_free0 (_tmp7_);
+#line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp8_ = authenicators;
+#line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp10_ = _tmp9_;
+#line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	g_debug ("shotwell-publishing.vala:23: Found %d authenicators", _tmp10_);
+#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp11_ = authenicators;
+#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp12_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection), "facebook");
+#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	if (_tmp12_) {
+#line 298 "shotwell-publishing.c"
+		SpitPluggable** _tmp13_ = NULL;
+		gint _tmp13__length1 = 0;
+		GFile* _tmp14_ = NULL;
+		FacebookService* _tmp15_ = NULL;
+#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_tmp13_ = self->priv->pluggables;
+#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_tmp13__length1 = self->priv->pluggables_length1;
+#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_tmp14_ = resource_directory;
+#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_tmp15_ = facebook_service_new (_tmp14_);
+#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_vala_array_add1 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+#line 313 "shotwell-publishing.c"
+	}
+#line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp16_ = authenicators;
+#line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp17_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection), "picasa");
+#line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	if (_tmp17_) {
+#line 321 "shotwell-publishing.c"
+		SpitPluggable** _tmp18_ = NULL;
+		gint _tmp18__length1 = 0;
+		GFile* _tmp19_ = NULL;
+		PicasaService* _tmp20_ = NULL;
+#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_tmp18_ = self->priv->pluggables;
+#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_tmp18__length1 = self->priv->pluggables_length1;
+#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_tmp19_ = resource_directory;
+#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_tmp20_ = picasa_service_new (_tmp19_);
+#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_vala_array_add2 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+#line 336 "shotwell-publishing.c"
+	}
+#line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp21_ = authenicators;
+#line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp22_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection), "flickr");
+#line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	if (_tmp22_) {
+#line 344 "shotwell-publishing.c"
+		SpitPluggable** _tmp23_ = NULL;
+		gint _tmp23__length1 = 0;
+		GFile* _tmp24_ = NULL;
+		FlickrService* _tmp25_ = NULL;
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_tmp23_ = self->priv->pluggables;
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_tmp23__length1 = self->priv->pluggables_length1;
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_tmp24_ = resource_directory;
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_tmp25_ = flickr_service_new (_tmp24_);
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_vala_array_add3 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+#line 359 "shotwell-publishing.c"
+	}
+#line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp26_ = authenicators;
+#line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp27_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection), "youtube");
+#line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	if (_tmp27_) {
+#line 367 "shotwell-publishing.c"
+		SpitPluggable** _tmp28_ = NULL;
+		gint _tmp28__length1 = 0;
+		GFile* _tmp29_ = NULL;
+		YouTubeService* _tmp30_ = NULL;
+#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_tmp28_ = self->priv->pluggables;
+#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_tmp28__length1 = self->priv->pluggables_length1;
+#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_tmp29_ = resource_directory;
+#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_tmp30_ = you_tube_service_new (_tmp29_);
+#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_vala_array_add4 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+#line 382 "shotwell-publishing.c"
+	}
+#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp31_ = self->priv->pluggables;
+#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp31__length1 = self->priv->pluggables_length1;
+#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp32_ = resource_directory;
+#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp33_ = piwigo_service_new (_tmp32_);
+#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_vala_array_add5 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+#line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_g_object_unref0 (authenicators);
+#line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_g_object_unref0 (factory);
 #line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_g_object_unref0 (resource_directory);
 #line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	return self;
-#line 297 "shotwell-publishing.c"
+#line 402 "shotwell-publishing.c"
 }
 
 
 ShotwellPublishingCoreServices* shotwell_publishing_core_services_new (GFile* module_file) {
 #line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	return shotwell_publishing_core_services_construct (TYPE_SHOTWELL_PUBLISHING_CORE_SERVICES, module_file);
-#line 304 "shotwell-publishing.c"
+#line 409 "shotwell-publishing.c"
 }
 
 
@@ -308,41 +413,41 @@ static const gchar* shotwell_publishing_core_services_real_get_module_name (Spit
 	ShotwellPublishingCoreServices * self;
 	const gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
-#line 25 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_PUBLISHING_CORE_SERVICES, ShotwellPublishingCoreServices);
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 55 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp0_ = _ ("Core Publishing Services");
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 55 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	result = _tmp0_;
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 55 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	return result;
-#line 320 "shotwell-publishing.c"
+#line 425 "shotwell-publishing.c"
 }
 
 
 static const gchar* shotwell_publishing_core_services_real_get_version (SpitModule* base) {
 	ShotwellPublishingCoreServices * self;
 	const gchar* result = NULL;
-#line 29 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_PUBLISHING_CORE_SERVICES, ShotwellPublishingCoreServices);
-#line 30 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 59 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	result = _VERSION;
-#line 30 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 59 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	return result;
-#line 333 "shotwell-publishing.c"
+#line 438 "shotwell-publishing.c"
 }
 
 
 static const gchar* shotwell_publishing_core_services_real_get_id (SpitModule* base) {
 	ShotwellPublishingCoreServices * self;
 	const gchar* result = NULL;
-#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_PUBLISHING_CORE_SERVICES, ShotwellPublishingCoreServices);
-#line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 63 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	result = "org.yorba.shotwell.publishing.core_services";
-#line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 63 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	return result;
-#line 346 "shotwell-publishing.c"
+#line 451 "shotwell-publishing.c"
 }
 
 
@@ -353,27 +458,27 @@ static SpitPluggable** shotwell_publishing_core_services_real_get_pluggables (Sp
 	gint _tmp0__length1 = 0;
 	SpitPluggable** _tmp1_ = NULL;
 	gint _tmp1__length1 = 0;
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_PUBLISHING_CORE_SERVICES, ShotwellPublishingCoreServices);
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp0_ = self->priv->pluggables;
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp0__length1 = self->priv->pluggables_length1;
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp1_ = _tmp0_;
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp1__length1 = _tmp0__length1;
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if (result_length1) {
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*result_length1 = _tmp1__length1;
-#line 371 "shotwell-publishing.c"
+#line 476 "shotwell-publishing.c"
 	}
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	result = _tmp1_;
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	return result;
-#line 377 "shotwell-publishing.c"
+#line 482 "shotwell-publishing.c"
 }
 
 
@@ -384,7 +489,7 @@ static void shotwell_publishing_core_services_class_init (ShotwellPublishingCore
 	g_type_class_add_private (klass, sizeof (ShotwellPublishingCoreServicesPrivate));
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = shotwell_publishing_core_services_finalize;
-#line 388 "shotwell-publishing.c"
+#line 493 "shotwell-publishing.c"
 }
 
 
@@ -399,7 +504,7 @@ static void shotwell_publishing_core_services_spit_module_interface_init (SpitMo
 	iface->get_id = (const gchar* (*)(SpitModule*)) shotwell_publishing_core_services_real_get_id;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	iface->get_pluggables = (SpitPluggable** (*)(SpitModule*, int*)) shotwell_publishing_core_services_real_get_pluggables;
-#line 403 "shotwell-publishing.c"
+#line 508 "shotwell-publishing.c"
 }
 
 
@@ -415,7 +520,7 @@ static void shotwell_publishing_core_services_instance_init (ShotwellPublishingC
 	self->priv->pluggables_length1 = 0;
 #line 11 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	self->priv->_pluggables_size_ = self->priv->pluggables_length1;
-#line 419 "shotwell-publishing.c"
+#line 524 "shotwell-publishing.c"
 }
 
 
@@ -427,7 +532,7 @@ static void shotwell_publishing_core_services_finalize (GObject* obj) {
 	self->priv->pluggables = (_vala_array_free (self->priv->pluggables, self->priv->pluggables_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	G_OBJECT_CLASS (shotwell_publishing_core_services_parent_class)->finalize (obj);
-#line 431 "shotwell-publishing.c"
+#line 536 "shotwell-publishing.c"
 }
 
 
@@ -455,51 +560,51 @@ SpitModule* spit_entry_point (SpitEntryPointParams* params) {
 	ShotwellPublishingCoreServices* _tmp5_ = NULL;
 	SpitEntryPointParams* _tmp6_ = NULL;
 	gint _tmp7_ = 0;
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp0_ = params;
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp1_ = (*_tmp0_).host_min_spit_interface;
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp2_ = params;
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp3_ = (*_tmp2_).host_max_spit_interface;
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp4_ = spit_negotiate_interfaces (_tmp1_, _tmp3_, SPIT_CURRENT_INTERFACE);
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*params).module_spit_interface = _tmp4_;
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp6_ = params;
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp7_ = (*_tmp6_).module_spit_interface;
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if (_tmp7_ != SPIT_UNSUPPORTED_INTERFACE) {
-#line 477 "shotwell-publishing.c"
+#line 582 "shotwell-publishing.c"
 		SpitEntryPointParams* _tmp8_ = NULL;
 		GFile* _tmp9_ = NULL;
 		ShotwellPublishingCoreServices* _tmp10_ = NULL;
-#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		_tmp8_ = params;
-#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		_tmp9_ = (*_tmp8_).module_file;
-#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		_tmp10_ = shotwell_publishing_core_services_new (_tmp9_);
-#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		_g_object_unref0 (_tmp5_);
-#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		_tmp5_ = _tmp10_;
-#line 491 "shotwell-publishing.c"
+#line 596 "shotwell-publishing.c"
 	} else {
-#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		_g_object_unref0 (_tmp5_);
-#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		_tmp5_ = NULL;
-#line 497 "shotwell-publishing.c"
+#line 602 "shotwell-publishing.c"
 	}
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_TYPE_MODULE, SpitModule);
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	return result;
-#line 503 "shotwell-publishing.c"
+#line 608 "shotwell-publishing.c"
 }
 
 
diff --git a/plugins/shotwell-publishing/shotwell-publishing.vala b/plugins/shotwell-publishing/shotwell-publishing.vala
index bbd5ddb..dce5954 100644
--- a/plugins/shotwell-publishing/shotwell-publishing.vala
+++ b/plugins/shotwell-publishing/shotwell-publishing.vala
@@ -14,12 +14,41 @@ private class ShotwellPublishingCoreServices : Object, Spit.Module {
     // module file directory
     public ShotwellPublishingCoreServices(GLib.File module_file) {
         GLib.File resource_directory = module_file.get_parent();
-        
-        pluggables += new FacebookService(resource_directory);
-        pluggables += new PicasaService(resource_directory);
-        pluggables += new FlickrService(resource_directory);
-        pluggables += new YouTubeService(resource_directory);
+        var factory = Publishing.Authenticator.Factory.get_instance();
+        var authenicators = factory.get_available_authenticators();
+
+        // Prevent vala complaining when all authenticators from this plugin
+        // are disabled
+        debug("Looking for resources in %s", resource_directory.get_path());
+        debug("Found %d authenicators", authenicators.size);
+
+#if HAVE_FACEBOOK
+        if (authenicators.contains("facebook")) {
+            pluggables += new FacebookService(resource_directory);
+        }
+#endif
+
+#if HAVE_PICASA
+        if (authenicators.contains("picasa")) {
+            pluggables += new PicasaService(resource_directory);
+        }
+#endif
+
+#if HAVE_FLICKR
+        if (authenicators.contains("flickr")) {
+            pluggables += new FlickrService(resource_directory);
+        }
+#endif
+
+#if HAVE_YOUTUBE
+        if (authenicators.contains("youtube")) {
+            pluggables += new YouTubeService(resource_directory);
+        }
+#endif
+
+#if HAVE_PIWIGO
         pluggables += new PiwigoService(resource_directory);
+#endif
     }
     
     public unowned string get_module_name() {