Merge branch 'release/0.28.3-1'0.28.3-1

15 files changed, 22709 insertions, 16311 deletions

diff --git a/plugins/shotwell-publishing/FacebookPublishing.c b/plugins/shotwell-publishing/FacebookPublishing.c
index a1d00b4..3b257d4 100644
--- a/plugins/shotwell-publishing/FacebookPublishing.c
+++ b/plugins/shotwell-publishing/FacebookPublishing.c
@@ -1,4 +1,4 @@
-/* FacebookPublishing.c generated by valac 0.36.6, the Vala compiler
+/* FacebookPublishing.c generated by valac 0.40.4, the Vala compiler
  * generated from FacebookPublishing.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <shotwell-plugin-dev-1.0.h>
@@ -35,6 +36,11 @@
 typedef struct _FacebookService FacebookService;
 typedef struct _FacebookServiceClass FacebookServiceClass;
 typedef struct _FacebookServicePrivate FacebookServicePrivate;
+enum  {
+	FACEBOOK_SERVICE_0_PROPERTY,
+	FACEBOOK_SERVICE_NUM_PROPERTIES
+};
+static GParamSpec* facebook_service_properties[FACEBOOK_SERVICE_NUM_PROPERTIES];
 #define _g_free0(var) (var = (g_free (var), NULL))
 
 #define PUBLISHING_FACEBOOK_TYPE_FACEBOOK_PUBLISHER (publishing_facebook_facebook_publisher_get_type ())
@@ -104,6 +110,11 @@ typedef struct _PublishingFacebookPublishingOptionsPaneClass PublishingFacebookP
 
 typedef struct _PublishingFacebookUploader PublishingFacebookUploader;
 typedef struct _PublishingFacebookUploaderClass PublishingFacebookUploaderClass;
+enum  {
+	PUBLISHING_FACEBOOK_FACEBOOK_PUBLISHER_0_PROPERTY,
+	PUBLISHING_FACEBOOK_FACEBOOK_PUBLISHER_NUM_PROPERTIES
+};
+static GParamSpec* publishing_facebook_facebook_publisher_properties[PUBLISHING_FACEBOOK_FACEBOOK_PUBLISHER_NUM_PROPERTIES];
 #define _publishing_facebook_publishing_parameters_unref0(var) ((var == NULL) ? NULL : (var = (publishing_facebook_publishing_parameters_unref (var), NULL)))
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 #define _publishing_facebook_graph_session_unref0(var) ((var == NULL) ? NULL : (var = (publishing_facebook_graph_session_unref (var), NULL)))
@@ -136,6 +147,11 @@ typedef struct _PublishingFacebookPublishingOptionsPanePrivate PublishingFaceboo
 
 typedef struct _PublishingFacebookPublishingOptionsPanePrivacyDescription PublishingFacebookPublishingOptionsPanePrivacyDescription;
 typedef struct _PublishingFacebookPublishingOptionsPanePrivacyDescriptionClass PublishingFacebookPublishingOptionsPanePrivacyDescriptionClass;
+enum  {
+	PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_0_PROPERTY,
+	PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_facebook_publishing_options_pane_properties[PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_NUM_PROPERTIES];
 #define _g_slist_free0(var) ((var == NULL) ? NULL : (var = (g_slist_free (var), NULL)))
 typedef struct _PublishingFacebookPublishingOptionsPanePrivacyDescriptionPrivate PublishingFacebookPublishingOptionsPanePrivacyDescriptionPrivate;
 #define _publishing_facebook_publishing_options_pane_privacy_description_unref0(var) ((var == NULL) ? NULL : (var = (publishing_facebook_publishing_options_pane_privacy_description_unref (var), NULL)))
@@ -143,9 +159,9 @@ typedef struct _PublishingFacebookPublishingOptionsPaneParamSpecPrivacyDescripti
 enum  {
 	PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL,
 	PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL,
-	PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL
+	PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_NUM_SIGNALS
 };
-static guint publishing_facebook_publishing_options_pane_signals[PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0};
+static guint publishing_facebook_publishing_options_pane_signals[PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_NUM_SIGNALS] = {0};
 
 #define PUBLISHING_FACEBOOK_TYPE_ENDPOINT (publishing_facebook_endpoint_get_type ())
 typedef struct _PublishingFacebookGraphMessagePrivate PublishingFacebookGraphMessagePrivate;
@@ -154,9 +170,9 @@ enum  {
 	PUBLISHING_FACEBOOK_GRAPH_MESSAGE_COMPLETED_SIGNAL,
 	PUBLISHING_FACEBOOK_GRAPH_MESSAGE_FAILED_SIGNAL,
 	PUBLISHING_FACEBOOK_GRAPH_MESSAGE_DATA_TRANSMITTED_SIGNAL,
-	PUBLISHING_FACEBOOK_GRAPH_MESSAGE_LAST_SIGNAL
+	PUBLISHING_FACEBOOK_GRAPH_MESSAGE_NUM_SIGNALS
 };
-static guint publishing_facebook_graph_message_signals[PUBLISHING_FACEBOOK_GRAPH_MESSAGE_LAST_SIGNAL] = {0};
+static guint publishing_facebook_graph_message_signals[PUBLISHING_FACEBOOK_GRAPH_MESSAGE_NUM_SIGNALS] = {0};
 typedef struct _PublishingFacebookGraphSessionPrivate PublishingFacebookGraphSessionPrivate;
 
 #define PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL (publishing_facebook_graph_session_graph_message_impl_get_type ())
@@ -222,17 +238,17 @@ typedef struct _PublishingFacebookGraphSessionGraphCreateAlbumMessagePrivate Pub
 typedef struct _PublishingFacebookParamSpecGraphSession PublishingFacebookParamSpecGraphSession;
 enum  {
 	PUBLISHING_FACEBOOK_GRAPH_SESSION_AUTHENTICATED_SIGNAL,
-	PUBLISHING_FACEBOOK_GRAPH_SESSION_LAST_SIGNAL
+	PUBLISHING_FACEBOOK_GRAPH_SESSION_NUM_SIGNALS
 };
-static guint publishing_facebook_graph_session_signals[PUBLISHING_FACEBOOK_GRAPH_SESSION_LAST_SIGNAL] = {0};
+static guint publishing_facebook_graph_session_signals[PUBLISHING_FACEBOOK_GRAPH_SESSION_NUM_SIGNALS] = {0};
 typedef struct _PublishingFacebookUploaderPrivate PublishingFacebookUploaderPrivate;
 typedef struct _PublishingFacebookParamSpecUploader PublishingFacebookParamSpecUploader;
 enum  {
 	PUBLISHING_FACEBOOK_UPLOADER_UPLOAD_COMPLETE_SIGNAL,
 	PUBLISHING_FACEBOOK_UPLOADER_UPLOAD_ERROR_SIGNAL,
-	PUBLISHING_FACEBOOK_UPLOADER_LAST_SIGNAL
+	PUBLISHING_FACEBOOK_UPLOADER_NUM_SIGNALS
 };
-static guint publishing_facebook_uploader_signals[PUBLISHING_FACEBOOK_UPLOADER_LAST_SIGNAL] = {0};
+static guint publishing_facebook_uploader_signals[PUBLISHING_FACEBOOK_UPLOADER_NUM_SIGNALS] = {0};
 #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; }
 #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
@@ -522,21 +538,28 @@ static gpointer publishing_facebook_graph_session_graph_create_album_message_par
 static gpointer publishing_facebook_uploader_parent_class = NULL;
 
 GType facebook_service_get_type (void) G_GNUC_CONST;
-enum  {
-	FACEBOOK_SERVICE_DUMMY_PROPERTY
-};
 #define FACEBOOK_SERVICE_ICON_FILENAME "facebook.png"
 FacebookService* facebook_service_new (GFile* resource_directory);
-FacebookService* facebook_service_construct (GType object_type, GFile* resource_directory);
-static gint facebook_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface);
+FacebookService* facebook_service_construct (GType object_type,
+                                             GFile* resource_directory);
+static gint facebook_service_real_get_pluggable_interface (SpitPluggable* base,
+                                                    gint min_host_interface,
+                                                    gint max_host_interface);
 static const gchar* facebook_service_real_get_id (SpitPluggable* base);
 static const gchar* facebook_service_real_get_pluggable_name (SpitPluggable* base);
-static void facebook_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info);
-static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, int length);
-static void facebook_service_real_activation (SpitPluggable* base, gboolean enabled);
-static SpitPublishingPublisher* facebook_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host);
-PublishingFacebookFacebookPublisher* publishing_facebook_facebook_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host);
-PublishingFacebookFacebookPublisher* publishing_facebook_facebook_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host);
+static void facebook_service_real_get_info (SpitPluggable* base,
+                                     SpitPluggableInfo* info);
+static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self,
+                              int length);
+static void facebook_service_real_activation (SpitPluggable* base,
+                                       gboolean enabled);
+static SpitPublishingPublisher* facebook_service_real_create_publisher (SpitPublishingService* base,
+                                                                 SpitPublishingPluginHost* host);
+PublishingFacebookFacebookPublisher* publishing_facebook_facebook_publisher_new (SpitPublishingService* service,
+                                                                                 SpitPublishingPluginHost* host);
+PublishingFacebookFacebookPublisher* publishing_facebook_facebook_publisher_construct (GType object_type,
+                                                                                       SpitPublishingService* service,
+                                                                                       SpitPublishingPluginHost* host);
 GType publishing_facebook_facebook_publisher_get_type (void) G_GNUC_CONST;
 static SpitPublishingPublisherMediaType facebook_service_real_get_supported_media (SpitPublishingService* base);
 static void facebook_service_finalize (GObject * obj);
@@ -546,16 +569,22 @@ static void facebook_service_finalize (GObject * obj);
 #define PUBLISHING_FACEBOOK_EXPIRED_SESSION_STATUS_CODE 400
 gpointer publishing_facebook_album_ref (gpointer instance);
 void publishing_facebook_album_unref (gpointer instance);
-GParamSpec* publishing_facebook_param_spec_album (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_facebook_value_set_album (GValue* value, gpointer v_object);
-void publishing_facebook_value_take_album (GValue* value, gpointer v_object);
+GParamSpec* publishing_facebook_param_spec_album (const gchar* name,
+                                                  const gchar* nick,
+                                                  const gchar* blurb,
+                                                  GType object_type,
+                                                  GParamFlags flags);
+void publishing_facebook_value_set_album (GValue* value,
+                                          gpointer v_object);
+void publishing_facebook_value_take_album (GValue* value,
+                                           gpointer v_object);
 gpointer publishing_facebook_value_get_album (const GValue* value);
 GType publishing_facebook_album_get_type (void) G_GNUC_CONST;
-enum  {
-	PUBLISHING_FACEBOOK_ALBUM_DUMMY_PROPERTY
-};
-PublishingFacebookAlbum* publishing_facebook_album_new (const gchar* name, const gchar* id);
-PublishingFacebookAlbum* publishing_facebook_album_construct (GType object_type, const gchar* name, const gchar* id);
+PublishingFacebookAlbum* publishing_facebook_album_new (const gchar* name,
+                                                        const gchar* id);
+PublishingFacebookAlbum* publishing_facebook_album_construct (GType object_type,
+                                                              const gchar* name,
+                                                              const gchar* id);
 static void publishing_facebook_album_finalize (PublishingFacebookAlbum * obj);
 GType publishing_facebook_resolution_get_type (void) G_GNUC_CONST;
 gchar* publishing_facebook_resolution_get_name (PublishingFacebookResolution self);
@@ -563,254 +592,438 @@ const gchar* publishing_facebook_resolution_to_string (PublishingFacebookResolut
 gint publishing_facebook_resolution_get_pixels (PublishingFacebookResolution self);
 gpointer publishing_facebook_publishing_parameters_ref (gpointer instance);
 void publishing_facebook_publishing_parameters_unref (gpointer instance);
-GParamSpec* publishing_facebook_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_facebook_value_set_publishing_parameters (GValue* value, gpointer v_object);
-void publishing_facebook_value_take_publishing_parameters (GValue* value, gpointer v_object);
+GParamSpec* publishing_facebook_param_spec_publishing_parameters (const gchar* name,
+                                                                  const gchar* nick,
+                                                                  const gchar* blurb,
+                                                                  GType object_type,
+                                                                  GParamFlags flags);
+void publishing_facebook_value_set_publishing_parameters (GValue* value,
+                                                          gpointer v_object);
+void publishing_facebook_value_take_publishing_parameters (GValue* value,
+                                                           gpointer v_object);
 gpointer publishing_facebook_value_get_publishing_parameters (const GValue* value);
 GType publishing_facebook_publishing_parameters_get_type (void) G_GNUC_CONST;
-enum  {
-	PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_DUMMY_PROPERTY
-};
 #define PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM -1
 PublishingFacebookPublishingParameters* publishing_facebook_publishing_parameters_new (void);
 PublishingFacebookPublishingParameters* publishing_facebook_publishing_parameters_construct (GType object_type);
-void publishing_facebook_publishing_parameters_add_album (PublishingFacebookPublishingParameters* self, const gchar* name, const gchar* id);
-static void _vala_array_add6 (PublishingFacebookAlbum** * array, int* length, int* size, PublishingFacebookAlbum* value);
-void publishing_facebook_publishing_parameters_set_target_album_by_name (PublishingFacebookPublishingParameters* self, const gchar* name);
+void publishing_facebook_publishing_parameters_add_album (PublishingFacebookPublishingParameters* self,
+                                                          const gchar* name,
+                                                          const gchar* id);
+static void _vala_array_add7 (PublishingFacebookAlbum** * array,
+                       int* length,
+                       int* size,
+                       PublishingFacebookAlbum* value);
+void publishing_facebook_publishing_parameters_set_target_album_by_name (PublishingFacebookPublishingParameters* self,
+                                                                         const gchar* name);
 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);
 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);
-void publishing_facebook_value_set_graph_session (GValue* value, gpointer v_object);
-void publishing_facebook_value_take_graph_session (GValue* value, gpointer v_object);
+GParamSpec* publishing_facebook_param_spec_graph_session (const gchar* name,
+                                                          const gchar* nick,
+                                                          const gchar* blurb,
+                                                          GType object_type,
+                                                          GParamFlags flags);
+void publishing_facebook_value_set_graph_session (GValue* value,
+                                                  gpointer v_object);
+void publishing_facebook_value_take_graph_session (GValue* value,
+                                                   gpointer v_object);
 gpointer publishing_facebook_value_get_graph_session (const GValue* value);
 GType publishing_facebook_graph_session_get_type (void) G_GNUC_CONST;
 GType publishing_facebook_publishing_options_pane_get_type (void) G_GNUC_CONST;
 gpointer publishing_facebook_uploader_ref (gpointer instance);
 void publishing_facebook_uploader_unref (gpointer instance);
-GParamSpec* publishing_facebook_param_spec_uploader (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_facebook_value_set_uploader (GValue* value, gpointer v_object);
-void publishing_facebook_value_take_uploader (GValue* value, gpointer v_object);
+GParamSpec* publishing_facebook_param_spec_uploader (const gchar* name,
+                                                     const gchar* nick,
+                                                     const gchar* blurb,
+                                                     GType object_type,
+                                                     GParamFlags flags);
+void publishing_facebook_value_set_uploader (GValue* value,
+                                             gpointer v_object);
+void publishing_facebook_value_take_uploader (GValue* value,
+                                              gpointer v_object);
 gpointer publishing_facebook_value_get_uploader (const GValue* value);
 GType publishing_facebook_uploader_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_FACEBOOK_FACEBOOK_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_FACEBOOK_TYPE_FACEBOOK_PUBLISHER, PublishingFacebookFacebookPublisherPrivate))
-enum  {
-	PUBLISHING_FACEBOOK_FACEBOOK_PUBLISHER_DUMMY_PROPERTY
-};
 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 void _publishing_facebook_facebook_publisher_on_session_authenticated_publishing_facebook_graph_session_authenticated (PublishingFacebookGraphSession* _sender,
+                                                                                                                       gpointer self);
 static gboolean publishing_facebook_facebook_publisher_get_persistent_strip_metadata (PublishingFacebookFacebookPublisher* self);
-static void publishing_facebook_facebook_publisher_set_persistent_strip_metadata (PublishingFacebookFacebookPublisher* self, gboolean strip_metadata);
+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);
+void publishing_facebook_facebook_publisher_set_persistent_default_size (PublishingFacebookFacebookPublisher* self,
+                                                                         gint size);
 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);
-void publishing_facebook_value_set_graph_message (GValue* value, gpointer v_object);
-void publishing_facebook_value_take_graph_message (GValue* value, gpointer v_object);
+GParamSpec* publishing_facebook_param_spec_graph_message (const gchar* name,
+                                                          const gchar* nick,
+                                                          const gchar* blurb,
+                                                          GType object_type,
+                                                          GParamFlags flags);
+void publishing_facebook_value_set_graph_message (GValue* value,
+                                                  gpointer v_object);
+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_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);
+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);
-static void publishing_facebook_facebook_publisher_on_fetch_albums_error (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message, GError* err);
-static void _publishing_facebook_facebook_publisher_on_fetch_albums_error_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender, GError* err, gpointer self);
-static void publishing_facebook_facebook_publisher_do_extract_user_info_from_json (PublishingFacebookFacebookPublisher* self, const gchar* json);
+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);
+static void publishing_facebook_facebook_publisher_on_fetch_albums_error (PublishingFacebookFacebookPublisher* self,
+                                                                   PublishingFacebookGraphMessage* message,
+                                                                   GError* err);
+static void _publishing_facebook_facebook_publisher_on_fetch_albums_error_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender,
+                                                                                                             GError* err,
+                                                                                                             gpointer self);
+static void publishing_facebook_facebook_publisher_do_extract_user_info_from_json (PublishingFacebookFacebookPublisher* self,
+                                                                            const gchar* json);
 static JsonNode* _vala_JsonNode_copy (JsonNode* self);
 static void _vala_JsonNode_free (JsonNode* self);
 static void publishing_facebook_facebook_publisher_on_user_info_extracted (PublishingFacebookFacebookPublisher* self);
-static void publishing_facebook_facebook_publisher_do_extract_albums_from_json (PublishingFacebookFacebookPublisher* self, const gchar* json);
+static void publishing_facebook_facebook_publisher_do_extract_albums_from_json (PublishingFacebookFacebookPublisher* self,
+                                                                         const gchar* json);
 static void publishing_facebook_facebook_publisher_on_albums_extracted (PublishingFacebookFacebookPublisher* self);
 static void publishing_facebook_facebook_publisher_do_create_new_album (PublishingFacebookFacebookPublisher* self);
-PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_create_album (PublishingFacebookGraphSession* self, const gchar* album_name, const gchar* privacy);
-static void publishing_facebook_facebook_publisher_on_create_album_completed (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message);
-static void _publishing_facebook_facebook_publisher_on_create_album_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender, gpointer self);
-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);
+PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_create_album (PublishingFacebookGraphSession* self,
+                                                                                    const gchar* album_name,
+                                                                                    const gchar* privacy);
+static void publishing_facebook_facebook_publisher_on_create_album_completed (PublishingFacebookFacebookPublisher* self,
+                                                                       PublishingFacebookGraphMessage* message);
+static void _publishing_facebook_facebook_publisher_on_create_album_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender,
+                                                                                                                    gpointer self);
+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, 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);
+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);
-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);
+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);
+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);
 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_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_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);
-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);
-static void _publishing_facebook_facebook_publisher_on_upload_complete_publishing_facebook_uploader_upload_complete (PublishingFacebookUploader* _sender, gint num_photos_published, gpointer self);
-static void publishing_facebook_facebook_publisher_on_upload_error (PublishingFacebookFacebookPublisher* self, PublishingFacebookUploader* uploader, GError* err);
-static void _publishing_facebook_facebook_publisher_on_upload_error_publishing_facebook_uploader_upload_error (PublishingFacebookUploader* _sender, GError* err, gpointer self);
-void publishing_facebook_uploader_upload (PublishingFacebookUploader* self, SpitPublishingProgressCallback status_updated, void* status_updated_target);
-static void publishing_facebook_facebook_publisher_on_upload_status_updated (PublishingFacebookFacebookPublisher* self, gint file_number, gdouble completed_fraction);
-static void _publishing_facebook_facebook_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self);
+void publishing_facebook_graph_session_authenticate (PublishingFacebookGraphSession* self,
+                                                     const gchar* access_token);
+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);
+static void _publishing_facebook_facebook_publisher_on_upload_complete_publishing_facebook_uploader_upload_complete (PublishingFacebookUploader* _sender,
+                                                                                                              gint num_photos_published,
+                                                                                                              gpointer self);
+static void publishing_facebook_facebook_publisher_on_upload_error (PublishingFacebookFacebookPublisher* self,
+                                                             PublishingFacebookUploader* uploader,
+                                                             GError* err);
+static void _publishing_facebook_facebook_publisher_on_upload_error_publishing_facebook_uploader_upload_error (PublishingFacebookUploader* _sender,
+                                                                                                        GError* err,
+                                                                                                        gpointer self);
+void publishing_facebook_uploader_upload (PublishingFacebookUploader* self,
+                                          SpitPublishingProgressCallback status_updated,
+                                          void* status_updated_target);
+static void publishing_facebook_facebook_publisher_on_upload_status_updated (PublishingFacebookFacebookPublisher* self,
+                                                                      gint file_number,
+                                                                      gdouble completed_fraction);
+static void _publishing_facebook_facebook_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number,
+                                                                                                         gdouble fraction_complete,
+                                                                                                         gpointer self);
 static void publishing_facebook_facebook_publisher_do_show_success_pane (PublishingFacebookFacebookPublisher* self);
-static void publishing_facebook_facebook_publisher_on_generic_error (PublishingFacebookFacebookPublisher* self, GError* _error_);
+static void publishing_facebook_facebook_publisher_on_generic_error (PublishingFacebookFacebookPublisher* self,
+                                                              GError* _error_);
 gboolean publishing_facebook_graph_session_is_authenticated (PublishingFacebookGraphSession* self);
 gchar* publishing_facebook_graph_message_get_response_body (PublishingFacebookGraphMessage* self);
 static SpitPublishingService* publishing_facebook_facebook_publisher_real_get_service (SpitPublishingPublisher* base);
 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);
-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_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);
 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;
-static void publishing_facebook_publishing_options_pane_value_set_privacy_description (GValue* value, gpointer v_object) G_GNUC_UNUSED;
-static void publishing_facebook_publishing_options_pane_value_take_privacy_description (GValue* value, gpointer v_object) G_GNUC_UNUSED;
+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;
+static void publishing_facebook_publishing_options_pane_value_set_privacy_description (GValue* value,
+                                                                                gpointer v_object) G_GNUC_UNUSED;
+static void publishing_facebook_publishing_options_pane_value_take_privacy_description (GValue* value,
+                                                                                 gpointer v_object) G_GNUC_UNUSED;
 static gpointer publishing_facebook_publishing_options_pane_value_get_privacy_description (const GValue* value) G_GNUC_UNUSED;
 static GType publishing_facebook_publishing_options_pane_privacy_description_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 #define PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFacebookPublishingOptionsPanePrivate))
-enum  {
-	PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_DUMMY_PROPERTY
-};
 #define PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_HEADER_LABEL_TEXT _ ("You are logged into Facebook as %s.\n\n")
 #define PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_PHOTOS_LABEL_TEXT _ ("Where would you like to publish the selected photos?")
 #define PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_RESOLUTION_LABEL_TEXT _ ("Upload _size:")
 #define PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_CONTENT_GROUP_SPACING 32
 #define PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_STANDARD_ACTION_BUTTON_WIDTH 128
-static PublishingFacebookAlbum** _vala_array_dup2 (PublishingFacebookAlbum** self, int length);
-static PublishingFacebookPublishingOptionsPanePrivacyDescription** publishing_facebook_publishing_options_pane_create_privacy_descriptions (PublishingFacebookPublishingOptionsPane* self, int* result_length1);
-static PublishingFacebookResolution* publishing_facebook_publishing_options_pane_create_resolution_list (PublishingFacebookPublishingOptionsPane* self, int* result_length1);
+static PublishingFacebookAlbum** _vala_array_dup2 (PublishingFacebookAlbum** self,
+                                            int length);
+static PublishingFacebookPublishingOptionsPanePrivacyDescription** publishing_facebook_publishing_options_pane_create_privacy_descriptions (PublishingFacebookPublishingOptionsPane* self,
+                                                                                                                                     int* result_length1);
+static PublishingFacebookResolution* publishing_facebook_publishing_options_pane_create_resolution_list (PublishingFacebookPublishingOptionsPane* self,
+                                                                                                  int* result_length1);
 static void publishing_facebook_publishing_options_pane_on_create_new_toggled (PublishingFacebookPublishingOptionsPane* self);
-static void _publishing_facebook_publishing_options_pane_on_create_new_toggled_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_facebook_publishing_options_pane_on_create_new_toggled_gtk_button_clicked (GtkButton* _sender,
+                                                                                            gpointer self);
 static void publishing_facebook_publishing_options_pane_on_use_existing_toggled (PublishingFacebookPublishingOptionsPane* self);
-static void _publishing_facebook_publishing_options_pane_on_use_existing_toggled_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_facebook_publishing_options_pane_on_use_existing_toggled_gtk_button_clicked (GtkButton* _sender,
+                                                                                              gpointer self);
 static void publishing_facebook_publishing_options_pane_setup_visibility_combo (PublishingFacebookPublishingOptionsPane* self);
 static void publishing_facebook_publishing_options_pane_on_publish_button_clicked (PublishingFacebookPublishingOptionsPane* self);
-static void _publishing_facebook_publishing_options_pane_on_publish_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_facebook_publishing_options_pane_on_publish_button_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                                gpointer self);
 static void publishing_facebook_publishing_options_pane_on_logout_button_clicked (PublishingFacebookPublishingOptionsPane* self);
-static void _publishing_facebook_publishing_options_pane_on_logout_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_facebook_publishing_options_pane_on_logout_button_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                               gpointer self);
 static void publishing_facebook_publishing_options_pane_setup_resolution_combo (PublishingFacebookPublishingOptionsPane* self);
 static void publishing_facebook_publishing_options_pane_on_size_changed (PublishingFacebookPublishingOptionsPane* self);
-static void _publishing_facebook_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void _publishing_facebook_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+                                                                                         gpointer self);
 static gboolean publishing_facebook_publishing_options_pane_publishing_photos (PublishingFacebookPublishingOptionsPane* self);
-static PublishingFacebookPublishingOptionsPanePrivacyDescription* publishing_facebook_publishing_options_pane_privacy_description_new (const gchar* description, const gchar* privacy_setting);
-static PublishingFacebookPublishingOptionsPanePrivacyDescription* publishing_facebook_publishing_options_pane_privacy_description_construct (GType object_type, const gchar* description, const gchar* privacy_setting);
-static void _vala_array_add7 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value);
-static void _vala_array_add8 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value);
-static void _vala_array_add9 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value);
-static void _vala_array_add10 (PublishingFacebookResolution* * array, int* length, int* size, PublishingFacebookResolution value);
-static void _vala_array_add11 (PublishingFacebookResolution* * array, int* length, int* size, PublishingFacebookResolution value);
+static PublishingFacebookPublishingOptionsPanePrivacyDescription* publishing_facebook_publishing_options_pane_privacy_description_new (const gchar* description,
+                                                                                                                                const gchar* privacy_setting);
+static PublishingFacebookPublishingOptionsPanePrivacyDescription* publishing_facebook_publishing_options_pane_privacy_description_construct (GType object_type,
+                                                                                                                                      const gchar* description,
+                                                                                                                                      const gchar* privacy_setting);
+static void _vala_array_add8 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array,
+                       int* length,
+                       int* size,
+                       PublishingFacebookPublishingOptionsPanePrivacyDescription* value);
+static void _vala_array_add9 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array,
+                       int* length,
+                       int* size,
+                       PublishingFacebookPublishingOptionsPanePrivacyDescription* value);
+static void _vala_array_add10 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array,
+                        int* length,
+                        int* size,
+                        PublishingFacebookPublishingOptionsPanePrivacyDescription* value);
+static void _vala_array_add11 (PublishingFacebookResolution* * array,
+                        int* length,
+                        int* size,
+                        PublishingFacebookResolution value);
+static void _vala_array_add12 (PublishingFacebookResolution* * array,
+                        int* length,
+                        int* size,
+                        PublishingFacebookResolution value);
 void publishing_facebook_publishing_options_pane_installed (PublishingFacebookPublishingOptionsPane* self);
 static void publishing_facebook_publishing_options_pane_notify_logout (PublishingFacebookPublishingOptionsPane* self);
-static void publishing_facebook_publishing_options_pane_notify_publish (PublishingFacebookPublishingOptionsPane* self, const gchar* target_album, const gchar* privacy_setting, PublishingFacebookResolution target_resolution);
+static void publishing_facebook_publishing_options_pane_notify_publish (PublishingFacebookPublishingOptionsPane* self,
+                                                                 const gchar* target_album,
+                                                                 const gchar* privacy_setting,
+                                                                 PublishingFacebookResolution target_resolution);
 static GtkWidget* publishing_facebook_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base);
 static SpitPublishingDialogPaneGeometryOptions publishing_facebook_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
 static void publishing_facebook_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
-static void _publishing_facebook_publishing_options_pane_notify_logout_publishing_facebook_publishing_options_pane_logout (PublishingFacebookPublishingOptionsPane* _sender, gpointer self);
-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);
+static void _publishing_facebook_publishing_options_pane_notify_logout_publishing_facebook_publishing_options_pane_logout (PublishingFacebookPublishingOptionsPane* _sender,
+                                                                                                                    gpointer self);
+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);
 static void publishing_facebook_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
-static void g_cclosure_user_marshal_VOID__STRING_STRING_ENUM_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-enum  {
-	PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_PRIVACY_DESCRIPTION_DUMMY_PROPERTY
-};
+static void g_cclosure_user_marshal_VOID__STRING_STRING_ENUM_BOOLEAN (GClosure * closure,
+                                                               GValue * return_value,
+                                                               guint n_param_values,
+                                                               const GValue * param_values,
+                                                               gpointer invocation_hint,
+                                                               gpointer marshal_data);
 static void publishing_facebook_publishing_options_pane_privacy_description_finalize (PublishingFacebookPublishingOptionsPanePrivacyDescription * obj);
 static void publishing_facebook_publishing_options_pane_finalize (GObject * obj);
 GType publishing_facebook_endpoint_get_type (void) G_GNUC_CONST;
 gchar* publishing_facebook_endpoint_to_uri (PublishingFacebookEndpoint self);
-enum  {
-	PUBLISHING_FACEBOOK_GRAPH_MESSAGE_DUMMY_PROPERTY
-};
 gchar* publishing_facebook_graph_message_get_uri (PublishingFacebookGraphMessage* self);
 static gchar* publishing_facebook_graph_message_real_get_uri (PublishingFacebookGraphMessage* self);
 static gchar* publishing_facebook_graph_message_real_get_response_body (PublishingFacebookGraphMessage* self);
 PublishingFacebookGraphMessage* publishing_facebook_graph_message_construct (GType object_type);
-static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
+static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure,
+                                            GValue * return_value,
+                                            guint n_param_values,
+                                            const GValue * param_values,
+                                            gpointer invocation_hint,
+                                            gpointer marshal_data);
 static void publishing_facebook_graph_message_finalize (PublishingFacebookGraphMessage * obj);
 #define PUBLISHING_FACEBOOK_GRAPH_SESSION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION, PublishingFacebookGraphSessionPrivate))
-enum  {
-	PUBLISHING_FACEBOOK_GRAPH_SESSION_DUMMY_PROPERTY
-};
-static void publishing_facebook_graph_session_on_request_unqueued (PublishingFacebookGraphSession* self, SoupMessage* msg);
-static void _publishing_facebook_graph_session_on_request_unqueued_soup_session_request_unqueued (SoupSession* _sender, SoupMessage* msg, gpointer self);
-static void publishing_facebook_graph_session_manage_message (PublishingFacebookGraphSession* self, PublishingFacebookGraphMessage* msg);
-static void publishing_facebook_graph_session_unmanage_message (PublishingFacebookGraphSession* self, PublishingFacebookGraphMessage* msg);
+static void publishing_facebook_graph_session_on_request_unqueued (PublishingFacebookGraphSession* self,
+                                                            SoupMessage* msg);
+static void _publishing_facebook_graph_session_on_request_unqueued_soup_session_request_unqueued (SoupSession* _sender,
+                                                                                           SoupMessage* msg,
+                                                                                           gpointer self);
+static void publishing_facebook_graph_session_manage_message (PublishingFacebookGraphSession* self,
+                                                       PublishingFacebookGraphMessage* msg);
+static void publishing_facebook_graph_session_unmanage_message (PublishingFacebookGraphSession* self,
+                                                         PublishingFacebookGraphMessage* msg);
 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 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 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 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;
-PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_upload (PublishingFacebookGraphSession* self, const gchar* resource_path, SpitPublishingPublishable* publishable, gboolean suppress_titling, const gchar* resource_privacy);
-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);
-static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_graph_session_graph_upload_message_construct (GType object_type, PublishingFacebookGraphSession* host_session, const gchar* access_token, const gchar* relative_uri, SpitPublishingPublishable* publishable, gboolean suppress_titling, const gchar* resource_privacy);
+PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_upload (PublishingFacebookGraphSession* self,
+                                                                              const gchar* resource_path,
+                                                                              SpitPublishingPublishable* publishable,
+                                                                              gboolean suppress_titling,
+                                                                              const gchar* resource_privacy);
+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);
+static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_graph_session_graph_upload_message_construct (GType object_type,
+                                                                                                                    PublishingFacebookGraphSession* host_session,
+                                                                                                                    const gchar* access_token,
+                                                                                                                    const gchar* relative_uri,
+                                                                                                                    SpitPublishingPublishable* publishable,
+                                                                                                                    gboolean suppress_titling,
+                                                                                                                    const gchar* resource_privacy);
 static GType publishing_facebook_graph_session_graph_upload_message_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
-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);
-static PublishingFacebookGraphSessionGraphCreateAlbumMessage* publishing_facebook_graph_session_graph_create_album_message_construct (GType object_type, PublishingFacebookGraphSession* host_session, const gchar* access_token, const gchar* album_name, const gchar* album_privacy);
+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);
+static PublishingFacebookGraphSessionGraphCreateAlbumMessage* publishing_facebook_graph_session_graph_create_album_message_construct (GType object_type,
+                                                                                                                               PublishingFacebookGraphSession* host_session,
+                                                                                                                               const gchar* access_token,
+                                                                                                                               const gchar* album_name,
+                                                                                                                               const gchar* album_privacy);
 static GType publishing_facebook_graph_session_graph_create_album_message_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 static gboolean publishing_facebook_graph_session_graph_message_impl_prepare_for_transmission (PublishingFacebookGraphSessionGraphMessageImpl* self);
-enum  {
-	PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_MESSAGE_IMPL_DUMMY_PROPERTY
-};
-static PublishingFacebookGraphSessionGraphMessageImpl* publishing_facebook_graph_session_graph_message_impl_construct (GType object_type, PublishingFacebookGraphSession* host_session, PublishingRESTSupportHttpMethod method, const gchar* relative_uri, const gchar* access_token, PublishingFacebookEndpoint endpoint);
+static PublishingFacebookGraphSessionGraphMessageImpl* publishing_facebook_graph_session_graph_message_impl_construct (GType object_type,
+                                                                                                                PublishingFacebookGraphSession* host_session,
+                                                                                                                PublishingRESTSupportHttpMethod method,
+                                                                                                                const gchar* relative_uri,
+                                                                                                                const gchar* access_token,
+                                                                                                                PublishingFacebookEndpoint endpoint);
 static gboolean publishing_facebook_graph_session_graph_message_impl_real_prepare_for_transmission (PublishingFacebookGraphSessionGraphMessageImpl* self);
 static gchar* publishing_facebook_graph_session_graph_message_impl_real_get_uri (PublishingFacebookGraphMessage* base);
 static gchar* publishing_facebook_graph_session_graph_message_impl_real_get_response_body (PublishingFacebookGraphMessage* base);
 static void publishing_facebook_graph_session_graph_message_impl_finalize (PublishingFacebookGraphMessage * obj);
-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);
+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
-};
 static void _vala_SoupMultipart_free (SoupMultipart* self);
 static void _vala_SoupBuffer_free (SoupBuffer* self);
 static gboolean publishing_facebook_graph_session_graph_upload_message_real_prepare_for_transmission (PublishingFacebookGraphSessionGraphMessageImpl* base);
 static void publishing_facebook_graph_session_graph_upload_message_finalize (PublishingFacebookGraphMessage * obj);
-enum  {
-	PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_CREATE_ALBUM_MESSAGE_DUMMY_PROPERTY
-};
 static void publishing_facebook_graph_session_finalize (PublishingFacebookGraphSession * obj);
 #define PUBLISHING_FACEBOOK_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_FACEBOOK_TYPE_UPLOADER, PublishingFacebookUploaderPrivate))
-enum  {
-	PUBLISHING_FACEBOOK_UPLOADER_DUMMY_PROPERTY
-};
-static SpitPublishingPublishable** _vala_array_dup3 (SpitPublishingPublishable** self, int length);
+static SpitPublishingPublishable** _vala_array_dup3 (SpitPublishingPublishable** self,
+                                              int length);
 static void publishing_facebook_uploader_send_current_file (PublishingFacebookUploader* self);
-static void publishing_facebook_uploader_on_chunk_transmitted (PublishingFacebookUploader* self, gint bytes_written_so_far, gint total_bytes);
-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);
-static void publishing_facebook_uploader_on_message_completed (PublishingFacebookUploader* self, PublishingFacebookGraphMessage* message);
-static void _publishing_facebook_uploader_on_message_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender, gpointer self);
-static void publishing_facebook_uploader_on_message_failed (PublishingFacebookUploader* self, PublishingFacebookGraphMessage* message, GError* _error_);
-static void _publishing_facebook_uploader_on_message_failed_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender, GError* err, gpointer self);
+static void publishing_facebook_uploader_on_chunk_transmitted (PublishingFacebookUploader* self,
+                                                        gint bytes_written_so_far,
+                                                        gint total_bytes);
+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);
+static void publishing_facebook_uploader_on_message_completed (PublishingFacebookUploader* self,
+                                                        PublishingFacebookGraphMessage* message);
+static void _publishing_facebook_uploader_on_message_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender,
+                                                                                                     gpointer self);
+static void publishing_facebook_uploader_on_message_failed (PublishingFacebookUploader* self,
+                                                     PublishingFacebookGraphMessage* message,
+                                                     GError* _error_);
+static void _publishing_facebook_uploader_on_message_failed_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender,
+                                                                                               GError* err,
+                                                                                               gpointer self);
 static void publishing_facebook_uploader_send_files (PublishingFacebookUploader* self);
 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);
-
-
-FacebookService* facebook_service_construct (GType object_type, GFile* resource_directory) {
+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);
+
+
+FacebookService*
+facebook_service_construct (GType object_type,
+                            GFile* resource_directory)
+{
 	FacebookService * self = NULL;
 	GdkPixbuf** _tmp0_;
 	gint _tmp0__length1;
@@ -824,7 +1037,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 828 "FacebookPublishing.c"
+#line 1041 "FacebookPublishing.c"
 		gint _tmp1_;
 		GdkPixbuf** _tmp2_;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -837,44 +1050,43 @@ 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 841 "FacebookPublishing.c"
+#line 1054 "FacebookPublishing.c"
 	}
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 845 "FacebookPublishing.c"
+#line 1058 "FacebookPublishing.c"
 }
 
 
-FacebookService* facebook_service_new (GFile* resource_directory) {
+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 852 "FacebookPublishing.c"
+#line 1067 "FacebookPublishing.c"
 }
 
 
-static gint facebook_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) {
+static gint
+facebook_service_real_get_pluggable_interface (SpitPluggable* base,
+                                               gint min_host_interface,
+                                               gint max_host_interface)
+{
 	FacebookService * self;
 	gint result = 0;
-	gint _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
 #line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FACEBOOK_SERVICE, FacebookService);
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = min_host_interface;
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = max_host_interface;
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = spit_negotiate_interfaces (_tmp0_, _tmp1_, SPIT_PUBLISHING_CURRENT_INTERFACE);
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	result = _tmp2_;
+	result = spit_negotiate_interfaces (min_host_interface, max_host_interface, SPIT_PUBLISHING_CURRENT_INTERFACE);
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 874 "FacebookPublishing.c"
+#line 1084 "FacebookPublishing.c"
 }
 
 
-static const gchar* facebook_service_real_get_id (SpitPluggable* base) {
+static const gchar*
+facebook_service_real_get_id (SpitPluggable* base)
+{
 	FacebookService * self;
 	const gchar* result = NULL;
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -883,11 +1095,13 @@ 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 887 "FacebookPublishing.c"
+#line 1099 "FacebookPublishing.c"
 }
 
 
-static const gchar* facebook_service_real_get_pluggable_name (SpitPluggable* base) {
+static const gchar*
+facebook_service_real_get_pluggable_name (SpitPluggable* base)
+{
 	FacebookService * self;
 	const gchar* result = NULL;
 #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -896,39 +1110,47 @@ 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 900 "FacebookPublishing.c"
+#line 1114 "FacebookPublishing.c"
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+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 907 "FacebookPublishing.c"
+#line 1123 "FacebookPublishing.c"
 }
 
 
-static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, int length) {
+static GdkPixbuf**
+_vala_array_dup1 (GdkPixbuf** self,
+                  int length)
+{
 	GdkPixbuf** result;
 	int i;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = g_new0 (GdkPixbuf*, length + 1);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 918 "FacebookPublishing.c"
+#line 1137 "FacebookPublishing.c"
 		GdkPixbuf* _tmp0_;
 #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 924 "FacebookPublishing.c"
+#line 1143 "FacebookPublishing.c"
 	}
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 928 "FacebookPublishing.c"
+#line 1147 "FacebookPublishing.c"
 }
 
 
-static void facebook_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) {
+static void
+facebook_service_real_get_info (SpitPluggable* base,
+                                SpitPluggableInfo* info)
+{
 	FacebookService * self;
 	gchar* _tmp0_;
 	gchar* _tmp1_;
@@ -1003,40 +1225,45 @@ static void facebook_service_real_get_info (SpitPluggable* base, SpitPluggableIn
 	(*info).icons = _tmp8_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*info).icons_length1 = _tmp8__length1;
-#line 1007 "FacebookPublishing.c"
+#line 1229 "FacebookPublishing.c"
 }
 
 
-static void facebook_service_real_activation (SpitPluggable* base, gboolean enabled) {
+static void
+facebook_service_real_activation (SpitPluggable* base,
+                                  gboolean enabled)
+{
 	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 1015 "FacebookPublishing.c"
+#line 1240 "FacebookPublishing.c"
 }
 
 
-static SpitPublishingPublisher* facebook_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) {
+static SpitPublishingPublisher*
+facebook_service_real_create_publisher (SpitPublishingService* base,
+                                        SpitPublishingPluginHost* host)
+{
 	FacebookService * self;
 	SpitPublishingPublisher* result = NULL;
-	SpitPublishingPluginHost* _tmp0_;
-	PublishingFacebookFacebookPublisher* _tmp1_;
+	PublishingFacebookFacebookPublisher* _tmp0_;
 #line 46 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FACEBOOK_SERVICE, FacebookService);
 #line 46 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = host;
+	_tmp0_ = publishing_facebook_facebook_publisher_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService), host);
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = publishing_facebook_facebook_publisher_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService), _tmp0_);
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
+	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 1036 "FacebookPublishing.c"
+#line 1261 "FacebookPublishing.c"
 }
 
 
-static SpitPublishingPublisherMediaType facebook_service_real_get_supported_media (SpitPublishingService* base) {
+static SpitPublishingPublisherMediaType
+facebook_service_real_get_supported_media (SpitPublishingService* base)
+{
 	FacebookService * self;
 	SpitPublishingPublisherMediaType result = 0;
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -1045,20 +1272,24 @@ 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 1049 "FacebookPublishing.c"
+#line 1276 "FacebookPublishing.c"
 }
 
 
-static void facebook_service_class_init (FacebookServiceClass * klass) {
+static void
+facebook_service_class_init (FacebookServiceClass * klass)
+{
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	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 1058 "FacebookPublishing.c"
+#line 1287 "FacebookPublishing.c"
 }
 
 
-static void facebook_service_spit_pluggable_interface_init (SpitPluggableIface * iface) {
+static void
+facebook_service_spit_pluggable_interface_init (SpitPluggableIface * iface)
+{
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	facebook_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -1071,36 +1302,44 @@ 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 1075 "FacebookPublishing.c"
+#line 1306 "FacebookPublishing.c"
 }
 
 
-static void facebook_service_spit_publishing_service_interface_init (SpitPublishingServiceIface * iface) {
+static void
+facebook_service_spit_publishing_service_interface_init (SpitPublishingServiceIface * iface)
+{
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	facebook_service_spit_publishing_service_parent_iface = g_type_interface_peek_parent (iface);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	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 1086 "FacebookPublishing.c"
+#line 1319 "FacebookPublishing.c"
 }
 
 
-static void facebook_service_instance_init (FacebookService * self) {
+static void
+facebook_service_instance_init (FacebookService * self)
+{
 }
 
 
-static void facebook_service_finalize (GObject * obj) {
+static void
+facebook_service_finalize (GObject * obj)
+{
 	FacebookService * self;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	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 1100 "FacebookPublishing.c"
+#line 1337 "FacebookPublishing.c"
 }
 
 
-GType facebook_service_get_type (void) {
+GType
+facebook_service_get_type (void)
+{
 	static volatile gsize facebook_service_type_id__volatile = 0;
 	if (g_once_init_enter (&facebook_service_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (FacebookServiceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) facebook_service_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (FacebookService), 0, (GInstanceInitFunc) facebook_service_instance_init, NULL };
@@ -1116,12 +1355,14 @@ GType facebook_service_get_type (void) {
 }
 
 
-PublishingFacebookAlbum* publishing_facebook_album_construct (GType object_type, const gchar* name, const gchar* id) {
+PublishingFacebookAlbum*
+publishing_facebook_album_construct (GType object_type,
+                                     const gchar* name,
+                                     const gchar* id)
+{
 	PublishingFacebookAlbum* self = NULL;
-	const gchar* _tmp0_;
+	gchar* _tmp0_;
 	gchar* _tmp1_;
-	const gchar* _tmp2_;
-	gchar* _tmp3_;
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -1129,132 +1370,156 @@ PublishingFacebookAlbum* publishing_facebook_album_construct (GType object_type,
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = (PublishingFacebookAlbum*) g_type_create_instance (object_type);
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = name;
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (name);
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->name);
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->name = _tmp1_;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = id;
+	self->name = _tmp0_;
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp3_ = g_strdup (_tmp2_);
+	_tmp1_ = g_strdup (id);
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->id);
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->id = _tmp3_;
+	self->id = _tmp1_;
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 1150 "FacebookPublishing.c"
+#line 1387 "FacebookPublishing.c"
 }
 
 
-PublishingFacebookAlbum* publishing_facebook_album_new (const gchar* name, const gchar* id) {
+PublishingFacebookAlbum*
+publishing_facebook_album_new (const gchar* name,
+                               const gchar* id)
+{
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_album_construct (PUBLISHING_FACEBOOK_TYPE_ALBUM, name, id);
-#line 1157 "FacebookPublishing.c"
+#line 1397 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_value_album_init (GValue* value) {
+static void
+publishing_facebook_value_album_init (GValue* value)
+{
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 1164 "FacebookPublishing.c"
+#line 1406 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_value_album_free_value (GValue* value) {
+static void
+publishing_facebook_value_album_free_value (GValue* value)
+{
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (value->data[0].v_pointer) {
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_album_unref (value->data[0].v_pointer);
-#line 1173 "FacebookPublishing.c"
+#line 1417 "FacebookPublishing.c"
 	}
 }
 
 
-static void publishing_facebook_value_album_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_facebook_value_album_copy_value (const GValue* src_value,
+                                            GValue* dest_value)
+{
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (src_value->data[0].v_pointer) {
 #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 1183 "FacebookPublishing.c"
+#line 1430 "FacebookPublishing.c"
 	} else {
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1187 "FacebookPublishing.c"
+#line 1434 "FacebookPublishing.c"
 	}
 }
 
 
-static gpointer publishing_facebook_value_album_peek_pointer (const GValue* value) {
+static gpointer
+publishing_facebook_value_album_peek_pointer (const GValue* value)
+{
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1195 "FacebookPublishing.c"
+#line 1444 "FacebookPublishing.c"
 }
 
 
-static gchar* publishing_facebook_value_album_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_facebook_value_album_collect_value (GValue* value,
+                                               guint n_collect_values,
+                                               GTypeCValue* collect_values,
+                                               guint collect_flags)
+{
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 1202 "FacebookPublishing.c"
+#line 1456 "FacebookPublishing.c"
 		PublishingFacebookAlbum * object;
 		object = collect_values[0].v_pointer;
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #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 1209 "FacebookPublishing.c"
+#line 1463 "FacebookPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #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 1213 "FacebookPublishing.c"
+#line 1467 "FacebookPublishing.c"
 		}
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = publishing_facebook_album_ref (object);
-#line 1217 "FacebookPublishing.c"
+#line 1471 "FacebookPublishing.c"
 	} else {
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1221 "FacebookPublishing.c"
+#line 1475 "FacebookPublishing.c"
 	}
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 1225 "FacebookPublishing.c"
+#line 1479 "FacebookPublishing.c"
 }
 
 
-static gchar* publishing_facebook_value_album_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+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 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!object_p) {
 #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 1236 "FacebookPublishing.c"
+#line 1495 "FacebookPublishing.c"
 	}
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = NULL;
-#line 1242 "FacebookPublishing.c"
+#line 1501 "FacebookPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1246 "FacebookPublishing.c"
+#line 1505 "FacebookPublishing.c"
 	} else {
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = publishing_facebook_album_ref (value->data[0].v_pointer);
-#line 1250 "FacebookPublishing.c"
+#line 1509 "FacebookPublishing.c"
 	}
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 1254 "FacebookPublishing.c"
+#line 1513 "FacebookPublishing.c"
 }
 
 
-GParamSpec* publishing_facebook_param_spec_album (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_facebook_param_spec_album (const gchar* name,
+                                      const gchar* nick,
+                                      const gchar* blurb,
+                                      GType object_type,
+                                      GParamFlags flags)
+{
 	PublishingFacebookParamSpecAlbum* spec;
 #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);
@@ -1264,20 +1529,25 @@ GParamSpec* publishing_facebook_param_spec_album (const gchar* name, const gchar
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 1268 "FacebookPublishing.c"
+#line 1533 "FacebookPublishing.c"
 }
 
 
-gpointer publishing_facebook_value_get_album (const GValue* value) {
+gpointer
+publishing_facebook_value_get_album (const GValue* value)
+{
 #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 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1277 "FacebookPublishing.c"
+#line 1544 "FacebookPublishing.c"
 }
 
 
-void publishing_facebook_value_set_album (GValue* value, gpointer v_object) {
+void
+publishing_facebook_value_set_album (GValue* value,
+                                     gpointer v_object)
+{
 	PublishingFacebookAlbum * old;
 #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));
@@ -1293,22 +1563,25 @@ void publishing_facebook_value_set_album (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_album_ref (value->data[0].v_pointer);
-#line 1297 "FacebookPublishing.c"
+#line 1567 "FacebookPublishing.c"
 	} else {
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1301 "FacebookPublishing.c"
+#line 1571 "FacebookPublishing.c"
 	}
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_album_unref (old);
-#line 1307 "FacebookPublishing.c"
+#line 1577 "FacebookPublishing.c"
 	}
 }
 
 
-void publishing_facebook_value_take_album (GValue* value, gpointer v_object) {
+void
+publishing_facebook_value_take_album (GValue* value,
+                                      gpointer v_object)
+{
 	PublishingFacebookAlbum * old;
 #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));
@@ -1322,38 +1595,44 @@ void publishing_facebook_value_take_album (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1326 "FacebookPublishing.c"
+#line 1599 "FacebookPublishing.c"
 	} else {
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1330 "FacebookPublishing.c"
+#line 1603 "FacebookPublishing.c"
 	}
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_album_unref (old);
-#line 1336 "FacebookPublishing.c"
+#line 1609 "FacebookPublishing.c"
 	}
 }
 
 
-static void publishing_facebook_album_class_init (PublishingFacebookAlbumClass * klass) {
+static void
+publishing_facebook_album_class_init (PublishingFacebookAlbumClass * klass)
+{
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_album_parent_class = g_type_class_peek_parent (klass);
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookAlbumClass *) klass)->finalize = publishing_facebook_album_finalize;
-#line 1346 "FacebookPublishing.c"
+#line 1621 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_album_instance_init (PublishingFacebookAlbum * self) {
+static void
+publishing_facebook_album_instance_init (PublishingFacebookAlbum * self)
+{
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->ref_count = 1;
-#line 1353 "FacebookPublishing.c"
+#line 1630 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_album_finalize (PublishingFacebookAlbum * obj) {
+static void
+publishing_facebook_album_finalize (PublishingFacebookAlbum * obj)
+{
 	PublishingFacebookAlbum * self;
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_ALBUM, PublishingFacebookAlbum);
@@ -1363,11 +1642,13 @@ static void publishing_facebook_album_finalize (PublishingFacebookAlbum * obj) {
 	_g_free0 (self->name);
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->id);
-#line 1367 "FacebookPublishing.c"
+#line 1646 "FacebookPublishing.c"
 }
 
 
-GType publishing_facebook_album_get_type (void) {
+GType
+publishing_facebook_album_get_type (void)
+{
 	static volatile gsize publishing_facebook_album_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_facebook_album_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { publishing_facebook_value_album_init, publishing_facebook_value_album_free_value, publishing_facebook_value_album_copy_value, publishing_facebook_value_album_peek_pointer, "p", publishing_facebook_value_album_collect_value, "p", publishing_facebook_value_album_lcopy_value };
@@ -1381,18 +1662,22 @@ GType publishing_facebook_album_get_type (void) {
 }
 
 
-gpointer publishing_facebook_album_ref (gpointer instance) {
+gpointer
+publishing_facebook_album_ref (gpointer instance)
+{
 	PublishingFacebookAlbum * self;
 	self = instance;
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return instance;
-#line 1392 "FacebookPublishing.c"
+#line 1675 "FacebookPublishing.c"
 }
 
 
-void publishing_facebook_album_unref (gpointer instance) {
+void
+publishing_facebook_album_unref (gpointer instance)
+{
 	PublishingFacebookAlbum * self;
 	self = instance;
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -1401,18 +1686,20 @@ void publishing_facebook_album_unref (gpointer instance) {
 		PUBLISHING_FACEBOOK_ALBUM_GET_CLASS (self)->finalize (self);
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1405 "FacebookPublishing.c"
+#line 1690 "FacebookPublishing.c"
 	}
 }
 
 
-gchar* publishing_facebook_resolution_get_name (PublishingFacebookResolution self) {
+gchar*
+publishing_facebook_resolution_get_name (PublishingFacebookResolution self)
+{
 	gchar* result = NULL;
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	switch (self) {
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case PUBLISHING_FACEBOOK_RESOLUTION_STANDARD:
-#line 1416 "FacebookPublishing.c"
+#line 1703 "FacebookPublishing.c"
 		{
 			gchar* _tmp0_;
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -1421,11 +1708,11 @@ gchar* publishing_facebook_resolution_get_name (PublishingFacebookResolution sel
 			result = _tmp0_;
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return result;
-#line 1425 "FacebookPublishing.c"
+#line 1712 "FacebookPublishing.c"
 		}
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case PUBLISHING_FACEBOOK_RESOLUTION_HIGH:
-#line 1429 "FacebookPublishing.c"
+#line 1716 "FacebookPublishing.c"
 		{
 			gchar* _tmp1_;
 #line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -1434,7 +1721,7 @@ gchar* publishing_facebook_resolution_get_name (PublishingFacebookResolution sel
 			result = _tmp1_;
 #line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return result;
-#line 1438 "FacebookPublishing.c"
+#line 1725 "FacebookPublishing.c"
 		}
 		default:
 		{
@@ -1443,35 +1730,37 @@ gchar* publishing_facebook_resolution_get_name (PublishingFacebookResolution sel
 			_tmp2_ = g_enum_get_value (g_type_class_ref (PUBLISHING_FACEBOOK_TYPE_RESOLUTION), self);
 #line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			g_error ("FacebookPublishing.vala:87: Unknown resolution %s", (_tmp2_ != NULL) ? _tmp2_->value_name : NULL);
-#line 1447 "FacebookPublishing.c"
+#line 1734 "FacebookPublishing.c"
 		}
 	}
 }
 
 
-gint publishing_facebook_resolution_get_pixels (PublishingFacebookResolution self) {
+gint
+publishing_facebook_resolution_get_pixels (PublishingFacebookResolution self)
+{
 	gint result = 0;
 #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	switch (self) {
 #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case PUBLISHING_FACEBOOK_RESOLUTION_STANDARD:
-#line 1459 "FacebookPublishing.c"
+#line 1748 "FacebookPublishing.c"
 		{
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			result = 720;
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return result;
-#line 1465 "FacebookPublishing.c"
+#line 1754 "FacebookPublishing.c"
 		}
 #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case PUBLISHING_FACEBOOK_RESOLUTION_HIGH:
-#line 1469 "FacebookPublishing.c"
+#line 1758 "FacebookPublishing.c"
 		{
 #line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			result = 2048;
 #line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return result;
-#line 1475 "FacebookPublishing.c"
+#line 1764 "FacebookPublishing.c"
 		}
 		default:
 		{
@@ -1480,13 +1769,15 @@ gint publishing_facebook_resolution_get_pixels (PublishingFacebookResolution sel
 			_tmp0_ = g_enum_get_value (g_type_class_ref (PUBLISHING_FACEBOOK_TYPE_RESOLUTION), self);
 #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 1484 "FacebookPublishing.c"
+#line 1773 "FacebookPublishing.c"
 		}
 	}
 }
 
 
-GType publishing_facebook_resolution_get_type (void) {
+GType
+publishing_facebook_resolution_get_type (void)
+{
 	static volatile gsize publishing_facebook_resolution_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_facebook_resolution_type_id__volatile)) {
 		static const GEnumValue values[] = {{PUBLISHING_FACEBOOK_RESOLUTION_STANDARD, "PUBLISHING_FACEBOOK_RESOLUTION_STANDARD", "standard"}, {PUBLISHING_FACEBOOK_RESOLUTION_HIGH, "PUBLISHING_FACEBOOK_RESOLUTION_HIGH", "high"}, {0, NULL, NULL}};
@@ -1498,7 +1789,9 @@ GType publishing_facebook_resolution_get_type (void) {
 }
 
 
-PublishingFacebookPublishingParameters* publishing_facebook_publishing_parameters_construct (GType object_type) {
+PublishingFacebookPublishingParameters*
+publishing_facebook_publishing_parameters_construct (GType object_type)
+{
 	PublishingFacebookPublishingParameters* self = NULL;
 #line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = (PublishingFacebookPublishingParameters*) g_type_create_instance (object_type);
@@ -1526,51 +1819,62 @@ PublishingFacebookPublishingParameters* publishing_facebook_publishing_parameter
 	self->resolution = PUBLISHING_FACEBOOK_RESOLUTION_HIGH;
 #line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 1530 "FacebookPublishing.c"
+#line 1823 "FacebookPublishing.c"
 }
 
 
-PublishingFacebookPublishingParameters* publishing_facebook_publishing_parameters_new (void) {
+PublishingFacebookPublishingParameters*
+publishing_facebook_publishing_parameters_new (void)
+{
 #line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_publishing_parameters_construct (PUBLISHING_FACEBOOK_TYPE_PUBLISHING_PARAMETERS);
-#line 1537 "FacebookPublishing.c"
+#line 1832 "FacebookPublishing.c"
 }
 
 
-static gpointer _publishing_facebook_album_ref0 (gpointer self) {
+static gpointer
+_publishing_facebook_album_ref0 (gpointer self)
+{
 #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? publishing_facebook_album_ref (self) : NULL;
-#line 1544 "FacebookPublishing.c"
+#line 1841 "FacebookPublishing.c"
 }
 
 
-static void _vala_array_add6 (PublishingFacebookAlbum** * array, int* length, int* size, PublishingFacebookAlbum* value) {
+static void
+_vala_array_add7 (PublishingFacebookAlbum** * array,
+                  int* length,
+                  int* size,
+                  PublishingFacebookAlbum* value)
+{
 #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if ((*length) == (*size)) {
 #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*array = g_renew (PublishingFacebookAlbum*, *array, (*size) + 1);
-#line 1555 "FacebookPublishing.c"
+#line 1857 "FacebookPublishing.c"
 	}
 #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[*length] = NULL;
-#line 1561 "FacebookPublishing.c"
+#line 1863 "FacebookPublishing.c"
 }
 
 
-void publishing_facebook_publishing_parameters_add_album (PublishingFacebookPublishingParameters* self, const gchar* name, const gchar* id) {
+void
+publishing_facebook_publishing_parameters_add_album (PublishingFacebookPublishingParameters* self,
+                                                     const gchar* name,
+                                                     const gchar* id)
+{
 	PublishingFacebookAlbum** _tmp0_;
 	gint _tmp0__length1;
 	PublishingFacebookAlbum* new_album = NULL;
-	const gchar* _tmp2_;
-	const gchar* _tmp3_;
+	PublishingFacebookAlbum* _tmp2_;
+	PublishingFacebookAlbum** _tmp3_;
+	gint _tmp3__length1;
 	PublishingFacebookAlbum* _tmp4_;
-	PublishingFacebookAlbum** _tmp5_;
-	gint _tmp5__length1;
-	PublishingFacebookAlbum* _tmp6_;
 #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_PARAMETERS (self));
 #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -1583,7 +1887,7 @@ void publishing_facebook_publishing_parameters_add_album (PublishingFacebookPubl
 	_tmp0__length1 = self->albums_length1;
 #line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 1587 "FacebookPublishing.c"
+#line 1891 "FacebookPublishing.c"
 		PublishingFacebookAlbum** _tmp1_;
 #line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp1_ = g_new0 (PublishingFacebookAlbum*, 0 + 1);
@@ -1595,123 +1899,118 @@ void publishing_facebook_publishing_parameters_add_album (PublishingFacebookPubl
 		self->albums_length1 = 0;
 #line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		self->_albums_size_ = self->albums_length1;
-#line 1599 "FacebookPublishing.c"
+#line 1903 "FacebookPublishing.c"
 	}
 #line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = name;
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp3_ = id;
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp4_ = publishing_facebook_album_new (_tmp2_, _tmp3_);
+	_tmp2_ = publishing_facebook_album_new (name, id);
 #line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	new_album = _tmp4_;
+	new_album = _tmp2_;
 #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = self->albums;
+	_tmp3_ = self->albums;
 #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5__length1 = self->albums_length1;
+	_tmp3__length1 = self->albums_length1;
 #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp6_ = _publishing_facebook_album_ref0 (new_album);
+	_tmp4_ = _publishing_facebook_album_ref0 (new_album);
 #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_vala_array_add6 (&self->albums, &self->albums_length1, &self->_albums_size_, _tmp6_);
+	_vala_array_add7 (&self->albums, &self->albums_length1, &self->_albums_size_, _tmp4_);
 #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_album_unref0 (new_album);
-#line 1619 "FacebookPublishing.c"
+#line 1919 "FacebookPublishing.c"
 }
 
 
-void publishing_facebook_publishing_parameters_set_target_album_by_name (PublishingFacebookPublishingParameters* self, const gchar* name) {
-	const gchar* _tmp0_;
+void
+publishing_facebook_publishing_parameters_set_target_album_by_name (PublishingFacebookPublishingParameters* self,
+                                                                    const gchar* name)
+{
 #line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_PARAMETERS (self));
 #line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = name;
-#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp0_ == NULL) {
+	if (name == NULL) {
 #line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		self->target_album = PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM;
 #line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 1635 "FacebookPublishing.c"
+#line 1935 "FacebookPublishing.c"
 	}
 	{
 		gint i = 0;
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		i = 0;
-#line 1641 "FacebookPublishing.c"
+#line 1941 "FacebookPublishing.c"
 		{
-			gboolean _tmp1_ = FALSE;
+			gboolean _tmp0_ = FALSE;
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp1_ = TRUE;
+			_tmp0_ = TRUE;
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			while (TRUE) {
-#line 1648 "FacebookPublishing.c"
-				gint _tmp3_;
+#line 1948 "FacebookPublishing.c"
+				gint _tmp2_;
+				PublishingFacebookAlbum** _tmp3_;
+				gint _tmp3__length1;
 				PublishingFacebookAlbum** _tmp4_;
 				gint _tmp4__length1;
-				PublishingFacebookAlbum** _tmp5_;
-				gint _tmp5__length1;
-				gint _tmp6_;
-				PublishingFacebookAlbum* _tmp7_;
-				const gchar* _tmp8_;
-				const gchar* _tmp9_;
+				gint _tmp5_;
+				PublishingFacebookAlbum* _tmp6_;
+				const gchar* _tmp7_;
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				if (!_tmp1_) {
-#line 1660 "FacebookPublishing.c"
-					gint _tmp2_;
+				if (!_tmp0_) {
+#line 1959 "FacebookPublishing.c"
+					gint _tmp1_;
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp2_ = i;
+					_tmp1_ = i;
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					i = _tmp2_ + 1;
-#line 1666 "FacebookPublishing.c"
+					i = _tmp1_ + 1;
+#line 1965 "FacebookPublishing.c"
 				}
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp1_ = FALSE;
+				_tmp0_ = FALSE;
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp3_ = i;
+				_tmp2_ = i;
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp4_ = self->albums;
+				_tmp3_ = self->albums;
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp4__length1 = self->albums_length1;
+				_tmp3__length1 = self->albums_length1;
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				if (!(_tmp3_ < _tmp4__length1)) {
+				if (!(_tmp2_ < _tmp3__length1)) {
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					break;
-#line 1680 "FacebookPublishing.c"
+#line 1979 "FacebookPublishing.c"
 				}
 #line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp5_ = self->albums;
-#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp5__length1 = self->albums_length1;
+				_tmp4_ = self->albums;
 #line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp6_ = i;
+				_tmp4__length1 = self->albums_length1;
 #line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp7_ = _tmp5_[_tmp6_];
+				_tmp5_ = i;
 #line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp8_ = _tmp7_->name;
+				_tmp6_ = _tmp4_[_tmp5_];
 #line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp9_ = name;
+				_tmp7_ = _tmp6_->name;
 #line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				if (g_strcmp0 (_tmp8_, _tmp9_) == 0) {
-#line 1696 "FacebookPublishing.c"
-					gint _tmp10_;
+				if (g_strcmp0 (_tmp7_, name) == 0) {
+#line 1993 "FacebookPublishing.c"
+					gint _tmp8_;
 #line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp10_ = i;
+					_tmp8_ = i;
 #line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					self->target_album = _tmp10_;
+					self->target_album = _tmp8_;
 #line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					return;
-#line 1704 "FacebookPublishing.c"
+#line 2001 "FacebookPublishing.c"
 				}
 			}
 		}
 	}
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->target_album = PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM;
-#line 1711 "FacebookPublishing.c"
+#line 2008 "FacebookPublishing.c"
 }
 
 
-gchar* publishing_facebook_publishing_parameters_get_target_album_name (PublishingFacebookPublishingParameters* self) {
+gchar*
+publishing_facebook_publishing_parameters_get_target_album_name (PublishingFacebookPublishingParameters* self)
+{
 	gchar* result = NULL;
 	gboolean _tmp0_ = FALSE;
 	PublishingFacebookAlbum** _tmp1_;
@@ -1732,14 +2031,14 @@ gchar* publishing_facebook_publishing_parameters_get_target_album_name (Publishi
 	if (_tmp1_ == NULL) {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = TRUE;
-#line 1736 "FacebookPublishing.c"
+#line 2035 "FacebookPublishing.c"
 	} else {
 		gint _tmp2_;
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp2_ = self->target_album;
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = _tmp2_ == PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM;
-#line 1743 "FacebookPublishing.c"
+#line 2042 "FacebookPublishing.c"
 	}
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp0_) {
@@ -1747,7 +2046,7 @@ gchar* publishing_facebook_publishing_parameters_get_target_album_name (Publishi
 		result = NULL;
 #line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return result;
-#line 1751 "FacebookPublishing.c"
+#line 2050 "FacebookPublishing.c"
 	}
 #line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = self->albums;
@@ -1765,11 +2064,13 @@ gchar* publishing_facebook_publishing_parameters_get_target_album_name (Publishi
 	result = _tmp7_;
 #line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 1769 "FacebookPublishing.c"
+#line 2068 "FacebookPublishing.c"
 }
 
 
-gchar* publishing_facebook_publishing_parameters_get_target_album_id (PublishingFacebookPublishingParameters* self) {
+gchar*
+publishing_facebook_publishing_parameters_get_target_album_id (PublishingFacebookPublishingParameters* self)
+{
 	gchar* result = NULL;
 	gboolean _tmp0_ = FALSE;
 	PublishingFacebookAlbum** _tmp1_;
@@ -1790,14 +2091,14 @@ gchar* publishing_facebook_publishing_parameters_get_target_album_id (Publishing
 	if (_tmp1_ == NULL) {
 #line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = TRUE;
-#line 1794 "FacebookPublishing.c"
+#line 2095 "FacebookPublishing.c"
 	} else {
 		gint _tmp2_;
 #line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp2_ = self->target_album;
 #line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = _tmp2_ == PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM;
-#line 1801 "FacebookPublishing.c"
+#line 2102 "FacebookPublishing.c"
 	}
 #line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp0_) {
@@ -1805,7 +2106,7 @@ gchar* publishing_facebook_publishing_parameters_get_target_album_id (Publishing
 		result = NULL;
 #line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return result;
-#line 1809 "FacebookPublishing.c"
+#line 2110 "FacebookPublishing.c"
 	}
 #line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = self->albums;
@@ -1823,108 +2124,133 @@ gchar* publishing_facebook_publishing_parameters_get_target_album_id (Publishing
 	result = _tmp7_;
 #line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 1827 "FacebookPublishing.c"
+#line 2128 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_value_publishing_parameters_init (GValue* value) {
+static void
+publishing_facebook_value_publishing_parameters_init (GValue* value)
+{
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 1834 "FacebookPublishing.c"
+#line 2137 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_value_publishing_parameters_free_value (GValue* value) {
+static void
+publishing_facebook_value_publishing_parameters_free_value (GValue* value)
+{
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (value->data[0].v_pointer) {
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_parameters_unref (value->data[0].v_pointer);
-#line 1843 "FacebookPublishing.c"
+#line 2148 "FacebookPublishing.c"
 	}
 }
 
 
-static void publishing_facebook_value_publishing_parameters_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_facebook_value_publishing_parameters_copy_value (const GValue* src_value,
+                                                            GValue* dest_value)
+{
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (src_value->data[0].v_pointer) {
 #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 1853 "FacebookPublishing.c"
+#line 2161 "FacebookPublishing.c"
 	} else {
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1857 "FacebookPublishing.c"
+#line 2165 "FacebookPublishing.c"
 	}
 }
 
 
-static gpointer publishing_facebook_value_publishing_parameters_peek_pointer (const GValue* value) {
+static gpointer
+publishing_facebook_value_publishing_parameters_peek_pointer (const GValue* value)
+{
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1865 "FacebookPublishing.c"
+#line 2175 "FacebookPublishing.c"
 }
 
 
-static gchar* publishing_facebook_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_facebook_value_publishing_parameters_collect_value (GValue* value,
+                                                               guint n_collect_values,
+                                                               GTypeCValue* collect_values,
+                                                               guint collect_flags)
+{
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 1872 "FacebookPublishing.c"
+#line 2187 "FacebookPublishing.c"
 		PublishingFacebookPublishingParameters * object;
 		object = collect_values[0].v_pointer;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #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 1879 "FacebookPublishing.c"
+#line 2194 "FacebookPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #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 1883 "FacebookPublishing.c"
+#line 2198 "FacebookPublishing.c"
 		}
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = publishing_facebook_publishing_parameters_ref (object);
-#line 1887 "FacebookPublishing.c"
+#line 2202 "FacebookPublishing.c"
 	} else {
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1891 "FacebookPublishing.c"
+#line 2206 "FacebookPublishing.c"
 	}
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 1895 "FacebookPublishing.c"
+#line 2210 "FacebookPublishing.c"
 }
 
 
-static gchar* publishing_facebook_value_publishing_parameters_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+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 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!object_p) {
 #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 1906 "FacebookPublishing.c"
+#line 2226 "FacebookPublishing.c"
 	}
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = NULL;
-#line 1912 "FacebookPublishing.c"
+#line 2232 "FacebookPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1916 "FacebookPublishing.c"
+#line 2236 "FacebookPublishing.c"
 	} else {
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = publishing_facebook_publishing_parameters_ref (value->data[0].v_pointer);
-#line 1920 "FacebookPublishing.c"
+#line 2240 "FacebookPublishing.c"
 	}
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 1924 "FacebookPublishing.c"
+#line 2244 "FacebookPublishing.c"
 }
 
 
-GParamSpec* publishing_facebook_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_facebook_param_spec_publishing_parameters (const gchar* name,
+                                                      const gchar* nick,
+                                                      const gchar* blurb,
+                                                      GType object_type,
+                                                      GParamFlags flags)
+{
 	PublishingFacebookParamSpecPublishingParameters* spec;
 #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);
@@ -1934,20 +2260,25 @@ GParamSpec* publishing_facebook_param_spec_publishing_parameters (const gchar* n
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 1938 "FacebookPublishing.c"
+#line 2264 "FacebookPublishing.c"
 }
 
 
-gpointer publishing_facebook_value_get_publishing_parameters (const GValue* value) {
+gpointer
+publishing_facebook_value_get_publishing_parameters (const GValue* value)
+{
 #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 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1947 "FacebookPublishing.c"
+#line 2275 "FacebookPublishing.c"
 }
 
 
-void publishing_facebook_value_set_publishing_parameters (GValue* value, gpointer v_object) {
+void
+publishing_facebook_value_set_publishing_parameters (GValue* value,
+                                                     gpointer v_object)
+{
 	PublishingFacebookPublishingParameters * old;
 #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));
@@ -1963,22 +2294,25 @@ void publishing_facebook_value_set_publishing_parameters (GValue* value, gpointe
 		value->data[0].v_pointer = v_object;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_parameters_ref (value->data[0].v_pointer);
-#line 1967 "FacebookPublishing.c"
+#line 2298 "FacebookPublishing.c"
 	} else {
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1971 "FacebookPublishing.c"
+#line 2302 "FacebookPublishing.c"
 	}
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_parameters_unref (old);
-#line 1977 "FacebookPublishing.c"
+#line 2308 "FacebookPublishing.c"
 	}
 }
 
 
-void publishing_facebook_value_take_publishing_parameters (GValue* value, gpointer v_object) {
+void
+publishing_facebook_value_take_publishing_parameters (GValue* value,
+                                                      gpointer v_object)
+{
 	PublishingFacebookPublishingParameters * old;
 #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));
@@ -1992,38 +2326,44 @@ void publishing_facebook_value_take_publishing_parameters (GValue* value, gpoint
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1996 "FacebookPublishing.c"
+#line 2330 "FacebookPublishing.c"
 	} else {
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 2000 "FacebookPublishing.c"
+#line 2334 "FacebookPublishing.c"
 	}
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_parameters_unref (old);
-#line 2006 "FacebookPublishing.c"
+#line 2340 "FacebookPublishing.c"
 	}
 }
 
 
-static void publishing_facebook_publishing_parameters_class_init (PublishingFacebookPublishingParametersClass * klass) {
+static void
+publishing_facebook_publishing_parameters_class_init (PublishingFacebookPublishingParametersClass * klass)
+{
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_parameters_parent_class = g_type_class_peek_parent (klass);
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookPublishingParametersClass *) klass)->finalize = publishing_facebook_publishing_parameters_finalize;
-#line 2016 "FacebookPublishing.c"
+#line 2352 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_publishing_parameters_instance_init (PublishingFacebookPublishingParameters * self) {
+static void
+publishing_facebook_publishing_parameters_instance_init (PublishingFacebookPublishingParameters * self)
+{
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->ref_count = 1;
-#line 2023 "FacebookPublishing.c"
+#line 2361 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_publishing_parameters_finalize (PublishingFacebookPublishingParameters * obj) {
+static void
+publishing_facebook_publishing_parameters_finalize (PublishingFacebookPublishingParameters * obj)
+{
 	PublishingFacebookPublishingParameters * self;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_PARAMETERS, PublishingFacebookPublishingParameters);
@@ -2035,11 +2375,13 @@ static void publishing_facebook_publishing_parameters_finalize (PublishingFacebo
 	_g_free0 (self->new_album_name);
 #line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->privacy_object);
-#line 2039 "FacebookPublishing.c"
+#line 2379 "FacebookPublishing.c"
 }
 
 
-GType publishing_facebook_publishing_parameters_get_type (void) {
+GType
+publishing_facebook_publishing_parameters_get_type (void)
+{
 	static volatile gsize publishing_facebook_publishing_parameters_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_facebook_publishing_parameters_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { publishing_facebook_value_publishing_parameters_init, publishing_facebook_value_publishing_parameters_free_value, publishing_facebook_value_publishing_parameters_copy_value, publishing_facebook_value_publishing_parameters_peek_pointer, "p", publishing_facebook_value_publishing_parameters_collect_value, "p", publishing_facebook_value_publishing_parameters_lcopy_value };
@@ -2053,18 +2395,22 @@ GType publishing_facebook_publishing_parameters_get_type (void) {
 }
 
 
-gpointer publishing_facebook_publishing_parameters_ref (gpointer instance) {
+gpointer
+publishing_facebook_publishing_parameters_ref (gpointer instance)
+{
 	PublishingFacebookPublishingParameters * self;
 	self = instance;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return instance;
-#line 2064 "FacebookPublishing.c"
+#line 2408 "FacebookPublishing.c"
 }
 
 
-void publishing_facebook_publishing_parameters_unref (gpointer instance) {
+void
+publishing_facebook_publishing_parameters_unref (gpointer instance)
+{
 	PublishingFacebookPublishingParameters * self;
 	self = instance;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -2073,29 +2419,33 @@ void publishing_facebook_publishing_parameters_unref (gpointer instance) {
 		PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self);
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2077 "FacebookPublishing.c"
+#line 2423 "FacebookPublishing.c"
 	}
 }
 
 
-static void _publishing_facebook_facebook_publisher_on_session_authenticated_publishing_facebook_graph_session_authenticated (PublishingFacebookGraphSession* _sender, gpointer self) {
+static void
+_publishing_facebook_facebook_publisher_on_session_authenticated_publishing_facebook_graph_session_authenticated (PublishingFacebookGraphSession* _sender,
+                                                                                                                  gpointer self)
+{
 #line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_session_authenticated ((PublishingFacebookFacebookPublisher*) self);
-#line 2085 "FacebookPublishing.c"
+#line 2434 "FacebookPublishing.c"
 }
 
 
-PublishingFacebookFacebookPublisher* publishing_facebook_facebook_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) {
+PublishingFacebookFacebookPublisher*
+publishing_facebook_facebook_publisher_construct (GType object_type,
+                                                  SpitPublishingService* service,
+                                                  SpitPublishingPluginHost* host)
+{
 	PublishingFacebookFacebookPublisher * self = NULL;
-	SpitPublishingService* _tmp0_;
-	SpitPublishingPluginHost* _tmp1_;
-	PublishingFacebookPublishingParameters* _tmp2_;
-	PublishingAuthenticatorFactory* _tmp3_;
-	PublishingAuthenticatorFactory* _tmp4_;
-	SpitPublishingPluginHost* _tmp5_;
-	SpitPublishingAuthenticator* _tmp6_;
-	PublishingFacebookGraphSession* _tmp7_;
-	PublishingFacebookGraphSession* _tmp8_;
+	PublishingFacebookPublishingParameters* _tmp0_;
+	PublishingAuthenticatorFactory* _tmp1_;
+	PublishingAuthenticatorFactory* _tmp2_;
+	SpitPublishingAuthenticator* _tmp3_;
+	PublishingFacebookGraphSession* _tmp4_;
+	PublishingFacebookGraphSession* _tmp5_;
 #line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
 #line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -2105,137 +2455,141 @@ PublishingFacebookFacebookPublisher* publishing_facebook_facebook_publisher_cons
 #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 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->service = _tmp0_;
-#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = host;
+	self->priv->service = service;
 #line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->host = _tmp1_;
+	self->priv->host = host;
 #line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = publishing_facebook_publishing_parameters_new ();
+	_tmp0_ = publishing_facebook_publishing_parameters_new ();
 #line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_publishing_parameters_unref0 (self->priv->publishing_params);
 #line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->publishing_params = _tmp2_;
-#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp3_ = publishing_authenticator_factory_get_instance ();
+	self->priv->publishing_params = _tmp0_;
 #line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp4_ = _tmp3_;
+	_tmp1_ = publishing_authenticator_factory_get_instance ();
 #line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = host;
+	_tmp2_ = _tmp1_;
 #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_);
+	_tmp3_ = spit_publishing_authenticator_factory_create (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY, SpitPublishingAuthenticatorFactory), "facebook", host);
 #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_;
+	self->priv->authenticator = _tmp3_;
 #line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_object_unref0 (_tmp4_);
+	_g_object_unref0 (_tmp2_);
 #line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp7_ = publishing_facebook_graph_session_new ();
+	_tmp4_ = 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 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->graph_session = _tmp7_;
+	self->priv->graph_session = _tmp4_;
 #line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp8_ = self->priv->graph_session;
+	_tmp5_ = 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);
+	g_signal_connect_object (_tmp5_, "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 2148 "FacebookPublishing.c"
+#line 2492 "FacebookPublishing.c"
 }
 
 
-PublishingFacebookFacebookPublisher* publishing_facebook_facebook_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
+PublishingFacebookFacebookPublisher*
+publishing_facebook_facebook_publisher_new (SpitPublishingService* service,
+                                            SpitPublishingPluginHost* host)
+{
 #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 2155 "FacebookPublishing.c"
+#line 2502 "FacebookPublishing.c"
 }
 
 
-static gboolean publishing_facebook_facebook_publisher_get_persistent_strip_metadata (PublishingFacebookFacebookPublisher* self) {
+static gboolean
+publishing_facebook_facebook_publisher_get_persistent_strip_metadata (PublishingFacebookFacebookPublisher* self)
+{
 	gboolean result = FALSE;
 	SpitPublishingPluginHost* _tmp0_;
-	gboolean _tmp1_;
 #line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self), FALSE);
 #line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->host;
 #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 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	result = _tmp1_;
+	result = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", FALSE);
 #line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 2173 "FacebookPublishing.c"
+#line 2519 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_facebook_publisher_set_persistent_strip_metadata (PublishingFacebookFacebookPublisher* self, gboolean strip_metadata) {
+static void
+publishing_facebook_facebook_publisher_set_persistent_strip_metadata (PublishingFacebookFacebookPublisher* self,
+                                                                      gboolean strip_metadata)
+{
 	SpitPublishingPluginHost* _tmp0_;
-	gboolean _tmp1_;
 #line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->host;
 #line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = strip_metadata;
-#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 2188 "FacebookPublishing.c"
+	spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", strip_metadata);
+#line 2534 "FacebookPublishing.c"
 }
 
 
-gint publishing_facebook_facebook_publisher_get_persistent_default_size (PublishingFacebookFacebookPublisher* self) {
+gint
+publishing_facebook_facebook_publisher_get_persistent_default_size (PublishingFacebookFacebookPublisher* self)
+{
 	gint result = 0;
 	SpitPublishingPluginHost* _tmp0_;
-	gint _tmp1_;
 #line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self), 0);
 #line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->host;
 #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 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	result = _tmp1_;
+	result = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_size", 0);
 #line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 2206 "FacebookPublishing.c"
+#line 2551 "FacebookPublishing.c"
 }
 
 
-void publishing_facebook_facebook_publisher_set_persistent_default_size (PublishingFacebookFacebookPublisher* self, gint size) {
+void
+publishing_facebook_facebook_publisher_set_persistent_default_size (PublishingFacebookFacebookPublisher* self,
+                                                                    gint size)
+{
 	SpitPublishingPluginHost* _tmp0_;
-	gint _tmp1_;
 #line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->host;
 #line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = size;
-#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 2221 "FacebookPublishing.c"
+	spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_size", size);
+#line 2566 "FacebookPublishing.c"
 }
 
 
-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_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender,
+                                                                                                                  gpointer self)
+{
 #line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_fetch_user_info_completed ((PublishingFacebookFacebookPublisher*) self, _sender);
-#line 2228 "FacebookPublishing.c"
+#line 2576 "FacebookPublishing.c"
 }
 
 
-static void _publishing_facebook_facebook_publisher_on_fetch_user_info_error_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender, GError* err, gpointer self) {
+static void
+_publishing_facebook_facebook_publisher_on_fetch_user_info_error_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender,
+                                                                                                           GError* err,
+                                                                                                           gpointer self)
+{
 #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 2235 "FacebookPublishing.c"
+#line 2587 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_facebook_publisher_do_fetch_user_info (PublishingFacebookFacebookPublisher* self) {
+static void
+publishing_facebook_facebook_publisher_do_fetch_user_info (PublishingFacebookFacebookPublisher* self)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	SpitPublishingPluginHost* _tmp1_;
 	PublishingFacebookGraphMessage* user_info_message = NULL;
@@ -2270,25 +2624,34 @@ static void publishing_facebook_facebook_publisher_do_fetch_user_info (Publishin
 	publishing_facebook_graph_session_send_message (_tmp4_, user_info_message);
 #line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (user_info_message);
-#line 2274 "FacebookPublishing.c"
+#line 2628 "FacebookPublishing.c"
 }
 
 
-static void _publishing_facebook_facebook_publisher_on_fetch_albums_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender, gpointer self) {
+static void
+_publishing_facebook_facebook_publisher_on_fetch_albums_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender,
+                                                                                                               gpointer self)
+{
 #line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_fetch_albums_completed ((PublishingFacebookFacebookPublisher*) self, _sender);
-#line 2281 "FacebookPublishing.c"
+#line 2638 "FacebookPublishing.c"
 }
 
 
-static void _publishing_facebook_facebook_publisher_on_fetch_albums_error_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender, GError* err, gpointer self) {
+static void
+_publishing_facebook_facebook_publisher_on_fetch_albums_error_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender,
+                                                                                                        GError* err,
+                                                                                                        gpointer self)
+{
 #line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_fetch_albums_error ((PublishingFacebookFacebookPublisher*) self, _sender, err);
-#line 2288 "FacebookPublishing.c"
+#line 2649 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_facebook_publisher_do_fetch_album_descriptions (PublishingFacebookFacebookPublisher* self) {
+static void
+publishing_facebook_facebook_publisher_do_fetch_album_descriptions (PublishingFacebookFacebookPublisher* self)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	SpitPublishingPluginHost* _tmp1_;
 	PublishingFacebookGraphMessage* albums_message = NULL;
@@ -2337,39 +2700,50 @@ static void publishing_facebook_facebook_publisher_do_fetch_album_descriptions (
 	publishing_facebook_graph_session_send_message (_tmp8_, albums_message);
 #line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (albums_message);
-#line 2341 "FacebookPublishing.c"
+#line 2704 "FacebookPublishing.c"
 }
 
 
-static JsonNode* _vala_JsonNode_copy (JsonNode* self) {
+static JsonNode*
+_vala_JsonNode_copy (JsonNode* self)
+{
 #line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return g_boxed_copy (json_node_get_type (), self);
-#line 2348 "FacebookPublishing.c"
+#line 2713 "FacebookPublishing.c"
 }
 
 
-static gpointer __vala_JsonNode_copy0 (gpointer self) {
+static gpointer
+__vala_JsonNode_copy0 (gpointer self)
+{
 #line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? _vala_JsonNode_copy (self) : NULL;
-#line 2355 "FacebookPublishing.c"
+#line 2722 "FacebookPublishing.c"
 }
 
 
-static gpointer _json_object_ref0 (gpointer self) {
+static gpointer
+_json_object_ref0 (gpointer self)
+{
 #line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? json_object_ref (self) : NULL;
-#line 2362 "FacebookPublishing.c"
+#line 2731 "FacebookPublishing.c"
 }
 
 
-static void _vala_JsonNode_free (JsonNode* self) {
+static void
+_vala_JsonNode_free (JsonNode* self)
+{
 #line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_boxed_free (json_node_get_type (), self);
-#line 2369 "FacebookPublishing.c"
+#line 2740 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_facebook_publisher_do_extract_user_info_from_json (PublishingFacebookFacebookPublisher* self, const gchar* json) {
+static void
+publishing_facebook_facebook_publisher_do_extract_user_info_from_json (PublishingFacebookFacebookPublisher* self,
+                                                                       const gchar* json)
+{
 	GError * _inner_error_ = NULL;
 #line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
@@ -2378,26 +2752,25 @@ static void publishing_facebook_facebook_publisher_do_extract_user_info_from_jso
 #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 2381 "FacebookPublishing.c"
+#line 2755 "FacebookPublishing.c"
 	{
 		JsonParser* parser = NULL;
 		JsonParser* _tmp0_;
 		JsonParser* _tmp1_;
-		const gchar* _tmp2_;
 		JsonNode* root = NULL;
-		JsonParser* _tmp3_;
+		JsonParser* _tmp2_;
+		JsonNode* _tmp3_;
 		JsonNode* _tmp4_;
-		JsonNode* _tmp5_;
 		JsonObject* response_object = NULL;
-		JsonNode* _tmp6_;
+		JsonNode* _tmp5_;
+		JsonObject* _tmp6_;
 		JsonObject* _tmp7_;
 		JsonObject* _tmp8_;
-		JsonObject* _tmp9_;
-		const gchar* _tmp10_;
-		gchar* _tmp11_;
-		JsonObject* _tmp12_;
-		const gchar* _tmp13_;
-		gchar* _tmp14_;
+		const gchar* _tmp9_;
+		gchar* _tmp10_;
+		JsonObject* _tmp11_;
+		const gchar* _tmp12_;
+		gchar* _tmp13_;
 #line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = json_parser_new ();
 #line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -2405,92 +2778,90 @@ static void publishing_facebook_facebook_publisher_do_extract_user_info_from_jso
 #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp1_ = parser;
 #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp2_ = json;
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		json_parser_load_from_data (_tmp1_, _tmp2_, (gssize) -1, &_inner_error_);
+		json_parser_load_from_data (_tmp1_, json, (gssize) -1, &_inner_error_);
 #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_object_unref0 (parser);
-#line 2415 "FacebookPublishing.c"
+#line 2786 "FacebookPublishing.c"
 			goto __catch0_g_error;
 		}
 #line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp3_ = parser;
+		_tmp2_ = parser;
 #line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp4_ = json_parser_get_root (_tmp3_);
+		_tmp3_ = json_parser_get_root (_tmp2_);
 #line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp5_ = __vala_JsonNode_copy0 (_tmp4_);
+		_tmp4_ = __vala_JsonNode_copy0 (_tmp3_);
 #line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		root = _tmp5_;
+		root = _tmp4_;
 #line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp6_ = root;
+		_tmp5_ = root;
 #line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp7_ = json_node_get_object (_tmp6_);
+		_tmp6_ = json_node_get_object (_tmp5_);
 #line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp8_ = _json_object_ref0 (_tmp7_);
+		_tmp7_ = _json_object_ref0 (_tmp6_);
 #line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		response_object = _tmp8_;
+		response_object = _tmp7_;
 #line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp9_ = response_object;
+		_tmp8_ = response_object;
 #line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp10_ = json_object_get_string_member (_tmp9_, "id");
+		_tmp9_ = json_object_get_string_member (_tmp8_, "id");
 #line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp11_ = g_strdup (_tmp10_);
+		_tmp10_ = g_strdup (_tmp9_);
 #line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (self->priv->uid);
 #line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		self->priv->uid = _tmp11_;
+		self->priv->uid = _tmp10_;
 #line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp12_ = response_object;
+		_tmp11_ = response_object;
 #line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp13_ = json_object_get_string_member (_tmp12_, "name");
+		_tmp12_ = json_object_get_string_member (_tmp11_, "name");
 #line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp14_ = g_strdup (_tmp13_);
+		_tmp13_ = g_strdup (_tmp12_);
 #line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (self->priv->username);
 #line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		self->priv->username = _tmp14_;
+		self->priv->username = _tmp13_;
 #line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_json_object_unref0 (response_object);
 #line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		__vala_JsonNode_free0 (root);
 #line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_object_unref0 (parser);
-#line 2460 "FacebookPublishing.c"
+#line 2831 "FacebookPublishing.c"
 	}
 	goto __finally0;
 	__catch0_g_error:
 	{
 		GError* _error_ = NULL;
-		SpitPublishingPluginHost* _tmp15_;
-		GError* _tmp16_;
-		const gchar* _tmp17_;
+		SpitPublishingPluginHost* _tmp14_;
+		GError* _tmp15_;
+		const gchar* _tmp16_;
+		GError* _tmp17_;
 		GError* _tmp18_;
-		GError* _tmp19_;
 #line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_error_ = _inner_error_;
 #line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_inner_error_ = NULL;
 #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp15_ = self->priv->host;
+		_tmp14_ = self->priv->host;
 #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp16_ = _error_;
+		_tmp15_ = _error_;
 #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp17_ = _tmp16_->message;
+		_tmp16_ = _tmp15_->message;
 #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_);
+		_tmp17_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp16_);
 #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp19_ = _tmp18_;
+		_tmp18_ = _tmp17_;
 #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp15_, _tmp19_);
+		spit_publishing_plugin_host_post_error (_tmp14_, _tmp18_);
 #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_g_error_free0 (_tmp19_);
+		_g_error_free0 (_tmp18_);
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_error_free0 (_error_);
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 2493 "FacebookPublishing.c"
+#line 2864 "FacebookPublishing.c"
 	}
 	__finally0:
 #line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -2501,22 +2872,27 @@ static void publishing_facebook_facebook_publisher_do_extract_user_info_from_jso
 		g_clear_error (&_inner_error_);
 #line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 2504 "FacebookPublishing.c"
+#line 2875 "FacebookPublishing.c"
 	}
 #line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_user_info_extracted (self);
-#line 2508 "FacebookPublishing.c"
+#line 2879 "FacebookPublishing.c"
 }
 
 
-static gpointer _json_array_ref0 (gpointer self) {
+static gpointer
+_json_array_ref0 (gpointer self)
+{
 #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? json_array_ref (self) : NULL;
-#line 2515 "FacebookPublishing.c"
+#line 2888 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_facebook_publisher_do_extract_albums_from_json (PublishingFacebookFacebookPublisher* self, const gchar* json) {
+static void
+publishing_facebook_facebook_publisher_do_extract_albums_from_json (PublishingFacebookFacebookPublisher* self,
+                                                                    const gchar* json)
+{
 	GError * _inner_error_ = NULL;
 #line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
@@ -2525,26 +2901,25 @@ static void publishing_facebook_facebook_publisher_do_extract_albums_from_json (
 #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 2527 "FacebookPublishing.c"
+#line 2903 "FacebookPublishing.c"
 	{
 		JsonParser* parser = NULL;
 		JsonParser* _tmp0_;
 		JsonParser* _tmp1_;
-		const gchar* _tmp2_;
 		JsonNode* root = NULL;
-		JsonParser* _tmp3_;
+		JsonParser* _tmp2_;
+		JsonNode* _tmp3_;
 		JsonNode* _tmp4_;
-		JsonNode* _tmp5_;
 		JsonObject* response_object = NULL;
-		JsonNode* _tmp6_;
+		JsonNode* _tmp5_;
+		JsonObject* _tmp6_;
 		JsonObject* _tmp7_;
-		JsonObject* _tmp8_;
 		JsonArray* album_list = NULL;
-		JsonObject* _tmp9_;
+		JsonObject* _tmp8_;
+		JsonArray* _tmp9_;
 		JsonArray* _tmp10_;
-		JsonArray* _tmp11_;
-		PublishingFacebookPublishingParameters* _tmp12_;
-		PublishingFacebookAlbum** _tmp13_;
+		PublishingFacebookPublishingParameters* _tmp11_;
+		PublishingFacebookAlbum** _tmp12_;
 #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = json_parser_new ();
 #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -2552,149 +2927,144 @@ static void publishing_facebook_facebook_publisher_do_extract_albums_from_json (
 #line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp1_ = parser;
 #line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp2_ = json;
-#line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		json_parser_load_from_data (_tmp1_, _tmp2_, (gssize) -1, &_inner_error_);
+		json_parser_load_from_data (_tmp1_, json, (gssize) -1, &_inner_error_);
 #line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_object_unref0 (parser);
-#line 2561 "FacebookPublishing.c"
+#line 2934 "FacebookPublishing.c"
 			goto __catch1_g_error;
 		}
 #line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp3_ = parser;
+		_tmp2_ = parser;
 #line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp4_ = json_parser_get_root (_tmp3_);
+		_tmp3_ = json_parser_get_root (_tmp2_);
 #line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp5_ = __vala_JsonNode_copy0 (_tmp4_);
+		_tmp4_ = __vala_JsonNode_copy0 (_tmp3_);
 #line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		root = _tmp5_;
+		root = _tmp4_;
 #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp6_ = root;
+		_tmp5_ = root;
 #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp7_ = json_node_get_object (_tmp6_);
+		_tmp6_ = json_node_get_object (_tmp5_);
 #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp8_ = _json_object_ref0 (_tmp7_);
+		_tmp7_ = _json_object_ref0 (_tmp6_);
 #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		response_object = _tmp8_;
+		response_object = _tmp7_;
 #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp9_ = response_object;
+		_tmp8_ = response_object;
 #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp10_ = json_object_get_array_member (_tmp9_, "data");
+		_tmp9_ = json_object_get_array_member (_tmp8_, "data");
 #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp11_ = _json_array_ref0 (_tmp10_);
+		_tmp10_ = _json_array_ref0 (_tmp9_);
 #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		album_list = _tmp11_;
+		album_list = _tmp10_;
 #line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp12_ = self->priv->publishing_params;
+		_tmp11_ = self->priv->publishing_params;
 #line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp13_ = g_new0 (PublishingFacebookAlbum*, 0 + 1);
+		_tmp12_ = g_new0 (PublishingFacebookAlbum*, 0 + 1);
 #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);
+		_tmp11_->albums = (_vala_array_free (_tmp11_->albums, _tmp11_->albums_length1, (GDestroyNotify) publishing_facebook_album_unref), NULL);
 #line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp12_->albums = _tmp13_;
+		_tmp11_->albums = _tmp12_;
 #line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp12_->albums_length1 = 0;
+		_tmp11_->albums_length1 = 0;
 #line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp12_->_albums_size_ = _tmp12_->albums_length1;
-#line 2600 "FacebookPublishing.c"
+		_tmp11_->_albums_size_ = _tmp11_->albums_length1;
+#line 2973 "FacebookPublishing.c"
 		{
 			gint i = 0;
 #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			i = 0;
-#line 2605 "FacebookPublishing.c"
+#line 2978 "FacebookPublishing.c"
 			{
-				gboolean _tmp14_ = FALSE;
+				gboolean _tmp13_ = FALSE;
 #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp14_ = TRUE;
+				_tmp13_ = TRUE;
 #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				while (TRUE) {
-#line 2612 "FacebookPublishing.c"
-					gint _tmp16_;
-					JsonArray* _tmp17_;
-					guint _tmp18_;
+#line 2985 "FacebookPublishing.c"
+					gint _tmp15_;
+					JsonArray* _tmp16_;
 					JsonObject* current_album = NULL;
-					JsonArray* _tmp19_;
-					gint _tmp20_;
-					JsonObject* _tmp21_;
-					JsonObject* _tmp22_;
+					JsonArray* _tmp17_;
+					gint _tmp18_;
+					JsonObject* _tmp19_;
+					JsonObject* _tmp20_;
 					gchar* album_id = NULL;
-					JsonObject* _tmp23_;
-					const gchar* _tmp24_;
-					gchar* _tmp25_;
+					JsonObject* _tmp21_;
+					const gchar* _tmp22_;
+					gchar* _tmp23_;
 					gchar* album_name = NULL;
-					JsonObject* _tmp26_;
-					const gchar* _tmp27_;
-					gchar* _tmp28_;
-					PublishingFacebookPublishingParameters* _tmp29_;
-					const gchar* _tmp30_;
-					const gchar* _tmp31_;
+					JsonObject* _tmp24_;
+					const gchar* _tmp25_;
+					gchar* _tmp26_;
+					PublishingFacebookPublishingParameters* _tmp27_;
+					const gchar* _tmp28_;
+					const gchar* _tmp29_;
 #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					if (!_tmp14_) {
-#line 2634 "FacebookPublishing.c"
-						gint _tmp15_;
+					if (!_tmp13_) {
+#line 3006 "FacebookPublishing.c"
+						gint _tmp14_;
 #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-						_tmp15_ = i;
+						_tmp14_ = i;
 #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-						i = _tmp15_ + 1;
-#line 2640 "FacebookPublishing.c"
+						i = _tmp14_ + 1;
+#line 3012 "FacebookPublishing.c"
 					}
 #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp14_ = FALSE;
-#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp16_ = i;
+					_tmp13_ = FALSE;
 #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp17_ = album_list;
+					_tmp15_ = i;
 #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp18_ = json_array_get_length (_tmp17_);
+					_tmp16_ = album_list;
 #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					if (!(((guint) _tmp16_) < _tmp18_)) {
+					if (!(((guint) _tmp15_) < json_array_get_length (_tmp16_))) {
 #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						break;
-#line 2654 "FacebookPublishing.c"
+#line 3024 "FacebookPublishing.c"
 					}
 #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp19_ = album_list;
+					_tmp17_ = album_list;
 #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp20_ = i;
+					_tmp18_ = i;
 #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp21_ = json_array_get_object_element (_tmp19_, (guint) _tmp20_);
+					_tmp19_ = json_array_get_object_element (_tmp17_, (guint) _tmp18_);
 #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp22_ = _json_object_ref0 (_tmp21_);
+					_tmp20_ = _json_object_ref0 (_tmp19_);
 #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					current_album = _tmp22_;
+					current_album = _tmp20_;
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp23_ = current_album;
+					_tmp21_ = current_album;
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp24_ = json_object_get_string_member (_tmp23_, "id");
+					_tmp22_ = json_object_get_string_member (_tmp21_, "id");
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp25_ = g_strdup (_tmp24_);
+					_tmp23_ = g_strdup (_tmp22_);
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					album_id = _tmp25_;
+					album_id = _tmp23_;
 #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp26_ = current_album;
+					_tmp24_ = current_album;
 #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp27_ = json_object_get_string_member (_tmp26_, "name");
+					_tmp25_ = json_object_get_string_member (_tmp24_, "name");
 #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp28_ = g_strdup (_tmp27_);
+					_tmp26_ = g_strdup (_tmp25_);
 #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					album_name = _tmp28_;
+					album_name = _tmp26_;
 #line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp29_ = self->priv->publishing_params;
+					_tmp27_ = self->priv->publishing_params;
 #line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp30_ = album_name;
+					_tmp28_ = album_name;
 #line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp31_ = album_id;
+					_tmp29_ = album_id;
 #line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					publishing_facebook_publishing_parameters_add_album (_tmp29_, _tmp30_, _tmp31_);
+					publishing_facebook_publishing_parameters_add_album (_tmp27_, _tmp28_, _tmp29_);
 #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_g_free0 (album_name);
 #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_g_free0 (album_id);
 #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_json_object_unref0 (current_album);
-#line 2696 "FacebookPublishing.c"
+#line 3066 "FacebookPublishing.c"
 				}
 			}
 		}
@@ -2706,40 +3076,40 @@ static void publishing_facebook_facebook_publisher_do_extract_albums_from_json (
 		__vala_JsonNode_free0 (root);
 #line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_object_unref0 (parser);
-#line 2708 "FacebookPublishing.c"
+#line 3078 "FacebookPublishing.c"
 	}
 	goto __finally1;
 	__catch1_g_error:
 	{
 		GError* _error_ = NULL;
-		SpitPublishingPluginHost* _tmp32_;
+		SpitPublishingPluginHost* _tmp30_;
+		GError* _tmp31_;
+		const gchar* _tmp32_;
 		GError* _tmp33_;
-		const gchar* _tmp34_;
-		GError* _tmp35_;
-		GError* _tmp36_;
+		GError* _tmp34_;
 #line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_error_ = _inner_error_;
 #line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_inner_error_ = NULL;
 #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp32_ = self->priv->host;
+		_tmp30_ = self->priv->host;
 #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp33_ = _error_;
+		_tmp31_ = _error_;
 #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp34_ = _tmp33_->message;
+		_tmp32_ = _tmp31_->message;
 #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_);
+		_tmp33_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp32_);
 #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp36_ = _tmp35_;
+		_tmp34_ = _tmp33_;
 #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp32_, _tmp36_);
+		spit_publishing_plugin_host_post_error (_tmp30_, _tmp34_);
 #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_g_error_free0 (_tmp36_);
+		_g_error_free0 (_tmp34_);
 #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_error_free0 (_error_);
 #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 2741 "FacebookPublishing.c"
+#line 3111 "FacebookPublishing.c"
 	}
 	__finally1:
 #line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -2750,29 +3120,38 @@ static void publishing_facebook_facebook_publisher_do_extract_albums_from_json (
 		g_clear_error (&_inner_error_);
 #line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 2752 "FacebookPublishing.c"
+#line 3122 "FacebookPublishing.c"
 	}
 #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_albums_extracted (self);
-#line 2756 "FacebookPublishing.c"
+#line 3126 "FacebookPublishing.c"
 }
 
 
-static void _publishing_facebook_facebook_publisher_on_create_album_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender, gpointer self) {
+static void
+_publishing_facebook_facebook_publisher_on_create_album_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender,
+                                                                                                               gpointer self)
+{
 #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_create_album_completed ((PublishingFacebookFacebookPublisher*) self, _sender);
-#line 2763 "FacebookPublishing.c"
+#line 3136 "FacebookPublishing.c"
 }
 
 
-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_on_create_album_error_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender,
+                                                                                                        GError* err,
+                                                                                                        gpointer self)
+{
 #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_create_album_error ((PublishingFacebookFacebookPublisher*) self, _sender, err);
-#line 2770 "FacebookPublishing.c"
+#line 3147 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_facebook_publisher_do_create_new_album (PublishingFacebookFacebookPublisher* self) {
+static void
+publishing_facebook_facebook_publisher_do_create_new_album (PublishingFacebookFacebookPublisher* self)
+{
 	PublishingFacebookPublishingParameters* _tmp0_;
 	const gchar* _tmp1_;
 	SpitPublishingPluginHost* _tmp2_;
@@ -2826,25 +3205,37 @@ static void publishing_facebook_facebook_publisher_do_create_new_album (Publishi
 	publishing_facebook_graph_session_send_message (_tmp10_, create_album_message);
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (create_album_message);
-#line 2827 "FacebookPublishing.c"
+#line 3206 "FacebookPublishing.c"
 }
 
 
-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_logout_publishing_facebook_publishing_options_pane_logout (PublishingFacebookPublishingOptionsPane* _sender,
+                                                                                                                              gpointer self)
+{
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_publishing_options_pane_logout ((PublishingFacebookFacebookPublisher*) self);
-#line 2834 "FacebookPublishing.c"
+#line 3216 "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) {
+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 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 2841 "FacebookPublishing.c"
+#line 3230 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_facebook_publisher_do_show_publishing_options_pane (PublishingFacebookFacebookPublisher* self) {
+static void
+publishing_facebook_facebook_publisher_do_show_publishing_options_pane (PublishingFacebookFacebookPublisher* self)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	GtkBuilder* builder = NULL;
 	GtkBuilder* _tmp1_;
@@ -2853,16 +3244,13 @@ static void publishing_facebook_facebook_publisher_do_show_publishing_options_pa
 	PublishingFacebookAlbum** _tmp10_;
 	gint _tmp10__length1;
 	SpitPublishingPluginHost* _tmp11_;
-	SpitPublishingPublisherMediaType _tmp12_;
-	GtkBuilder* _tmp13_;
-	gboolean _tmp14_;
-	SpitPublishingAuthenticator* _tmp15_;
-	gboolean _tmp16_;
-	PublishingFacebookPublishingOptionsPane* _tmp17_;
+	GtkBuilder* _tmp12_;
+	SpitPublishingAuthenticator* _tmp13_;
+	PublishingFacebookPublishingOptionsPane* _tmp14_;
+	PublishingFacebookPublishingOptionsPane* _tmp15_;
+	PublishingFacebookPublishingOptionsPane* _tmp16_;
+	SpitPublishingPluginHost* _tmp17_;
 	PublishingFacebookPublishingOptionsPane* _tmp18_;
-	PublishingFacebookPublishingOptionsPane* _tmp19_;
-	SpitPublishingPluginHost* _tmp20_;
-	PublishingFacebookPublishingOptionsPane* _tmp21_;
 	GError * _inner_error_ = NULL;
 #line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
@@ -2876,7 +3264,7 @@ static void publishing_facebook_facebook_publisher_do_show_publishing_options_pa
 	_tmp1_ = gtk_builder_new ();
 #line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	builder = _tmp1_;
-#line 2877 "FacebookPublishing.c"
+#line 3265 "FacebookPublishing.c"
 	{
 		GtkBuilder* _tmp2_;
 #line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -2885,7 +3273,7 @@ static void publishing_facebook_facebook_publisher_do_show_publishing_options_pa
 		gtk_builder_add_from_resource (_tmp2_, PLUGIN_RESOURCE_PATH "/" "facebook_publishing_options_pane.ui", &_inner_error_);
 #line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2886 "FacebookPublishing.c"
+#line 3274 "FacebookPublishing.c"
 			goto __catch2_g_error;
 		}
 	}
@@ -2925,7 +3313,7 @@ static void publishing_facebook_facebook_publisher_do_show_publishing_options_pa
 		_g_object_unref0 (builder);
 #line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 2925 "FacebookPublishing.c"
+#line 3313 "FacebookPublishing.c"
 	}
 	__finally2:
 #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -2938,7 +3326,7 @@ static void publishing_facebook_facebook_publisher_do_show_publishing_options_pa
 		g_clear_error (&_inner_error_);
 #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 2938 "FacebookPublishing.c"
+#line 3326 "FacebookPublishing.c"
 	}
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = self->priv->username;
@@ -2951,42 +3339,38 @@ static void publishing_facebook_facebook_publisher_do_show_publishing_options_pa
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp11_ = self->priv->host;
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp12_ = spit_publishing_plugin_host_get_publishable_media_type (_tmp11_);
-#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp13_ = builder;
-#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp14_ = publishing_facebook_facebook_publisher_get_persistent_strip_metadata (self);
+	_tmp12_ = builder;
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp15_ = self->priv->authenticator;
+	_tmp13_ = self->priv->authenticator;
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp16_ = spit_publishing_authenticator_can_logout (_tmp15_);
-#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp17_ = publishing_facebook_publishing_options_pane_new (_tmp8_, _tmp10_, _tmp10__length1, _tmp12_, self, _tmp13_, _tmp14_, _tmp16_);
+	_tmp14_ = publishing_facebook_publishing_options_pane_new (_tmp8_, _tmp10_, _tmp10__length1, spit_publishing_plugin_host_get_publishable_media_type (_tmp11_), self, _tmp12_, publishing_facebook_facebook_publisher_get_persistent_strip_metadata (self), spit_publishing_authenticator_can_logout (_tmp13_));
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->publishing_options_pane);
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->publishing_options_pane = _tmp17_;
+	self->priv->publishing_options_pane = _tmp14_;
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp18_ = self->priv->publishing_options_pane;
+	_tmp15_ = self->priv->publishing_options_pane;
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_connect_object (_tmp18_, "logout", (GCallback) _publishing_facebook_facebook_publisher_on_publishing_options_pane_logout_publishing_facebook_publishing_options_pane_logout, self, 0);
+	g_signal_connect_object (_tmp15_, "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"
-	_tmp19_ = self->priv->publishing_options_pane;
+	_tmp16_ = self->priv->publishing_options_pane;
 #line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_connect_object (_tmp19_, "publish", (GCallback) _publishing_facebook_facebook_publisher_on_publishing_options_pane_publish_publishing_facebook_publishing_options_pane_publish, self, 0);
+	g_signal_connect_object (_tmp16_, "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"
-	_tmp20_ = self->priv->host;
+	_tmp17_ = self->priv->host;
 #line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp21_ = self->priv->publishing_options_pane;
+	_tmp18_ = self->priv->publishing_options_pane;
 #line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	spit_publishing_plugin_host_install_dialog_pane (_tmp20_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+	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 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (builder);
-#line 2982 "FacebookPublishing.c"
+#line 3364 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_facebook_publisher_do_logout (PublishingFacebookFacebookPublisher* self) {
+static void
+publishing_facebook_facebook_publisher_do_logout (PublishingFacebookFacebookPublisher* self)
+{
 	SpitPublishingAuthenticator* _tmp0_;
 #line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
@@ -3001,13 +3385,16 @@ static void publishing_facebook_facebook_publisher_do_logout (PublishingFacebook
 	self->priv->running = FALSE;
 #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 3000 "FacebookPublishing.c"
+#line 3384 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_facebook_publisher_do_add_new_local_album_from_json (PublishingFacebookFacebookPublisher* self, const gchar* album_name, const gchar* json) {
-	PublishingFacebookPublishingParameters* _tmp20_;
-	const gchar* _tmp21_;
+static void
+publishing_facebook_facebook_publisher_do_add_new_local_album_from_json (PublishingFacebookFacebookPublisher* self,
+                                                                         const gchar* album_name,
+                                                                         const gchar* json)
+{
+	PublishingFacebookPublishingParameters* _tmp18_;
 	GError * _inner_error_ = NULL;
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
@@ -3015,27 +3402,25 @@ static void publishing_facebook_facebook_publisher_do_add_new_local_album_from_j
 	g_return_if_fail (album_name != NULL);
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (json != NULL);
-#line 3014 "FacebookPublishing.c"
+#line 3401 "FacebookPublishing.c"
 	{
 		JsonParser* parser = NULL;
 		JsonParser* _tmp0_;
 		JsonParser* _tmp1_;
-		const gchar* _tmp2_;
 		JsonNode* root = NULL;
-		JsonParser* _tmp3_;
+		JsonParser* _tmp2_;
+		JsonNode* _tmp3_;
 		JsonNode* _tmp4_;
-		JsonNode* _tmp5_;
 		JsonObject* response_object = NULL;
-		JsonNode* _tmp6_;
+		JsonNode* _tmp5_;
+		JsonObject* _tmp6_;
 		JsonObject* _tmp7_;
-		JsonObject* _tmp8_;
 		gchar* album_id = NULL;
-		JsonObject* _tmp9_;
-		const gchar* _tmp10_;
-		gchar* _tmp11_;
-		PublishingFacebookPublishingParameters* _tmp12_;
-		const gchar* _tmp13_;
-		const gchar* _tmp14_;
+		JsonObject* _tmp8_;
+		const gchar* _tmp9_;
+		gchar* _tmp10_;
+		PublishingFacebookPublishingParameters* _tmp11_;
+		const gchar* _tmp12_;
 #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = json_parser_new ();
 #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3043,48 +3428,44 @@ static void publishing_facebook_facebook_publisher_do_add_new_local_album_from_j
 #line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp1_ = parser;
 #line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp2_ = json;
-#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		json_parser_load_from_data (_tmp1_, _tmp2_, (gssize) -1, &_inner_error_);
+		json_parser_load_from_data (_tmp1_, json, (gssize) -1, &_inner_error_);
 #line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_object_unref0 (parser);
-#line 3049 "FacebookPublishing.c"
+#line 3432 "FacebookPublishing.c"
 			goto __catch3_g_error;
 		}
 #line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp3_ = parser;
+		_tmp2_ = parser;
 #line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp4_ = json_parser_get_root (_tmp3_);
+		_tmp3_ = json_parser_get_root (_tmp2_);
 #line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp5_ = __vala_JsonNode_copy0 (_tmp4_);
+		_tmp4_ = __vala_JsonNode_copy0 (_tmp3_);
 #line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		root = _tmp5_;
+		root = _tmp4_;
 #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp6_ = root;
+		_tmp5_ = root;
 #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp7_ = json_node_get_object (_tmp6_);
+		_tmp6_ = json_node_get_object (_tmp5_);
 #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp8_ = _json_object_ref0 (_tmp7_);
+		_tmp7_ = _json_object_ref0 (_tmp6_);
 #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		response_object = _tmp8_;
+		response_object = _tmp7_;
 #line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp9_ = response_object;
+		_tmp8_ = response_object;
 #line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp10_ = json_object_get_string_member (_tmp9_, "id");
+		_tmp9_ = json_object_get_string_member (_tmp8_, "id");
 #line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp11_ = g_strdup (_tmp10_);
+		_tmp10_ = g_strdup (_tmp9_);
 #line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		album_id = _tmp11_;
-#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp12_ = self->priv->publishing_params;
+		album_id = _tmp10_;
 #line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp13_ = album_name;
+		_tmp11_ = self->priv->publishing_params;
 #line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp14_ = album_id;
+		_tmp12_ = album_id;
 #line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		publishing_facebook_publishing_parameters_add_album (_tmp12_, _tmp13_, _tmp14_);
+		publishing_facebook_publishing_parameters_add_album (_tmp11_, album_name, _tmp12_);
 #line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (album_id);
 #line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3093,40 +3474,40 @@ static void publishing_facebook_facebook_publisher_do_add_new_local_album_from_j
 		__vala_JsonNode_free0 (root);
 #line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_object_unref0 (parser);
-#line 3092 "FacebookPublishing.c"
+#line 3473 "FacebookPublishing.c"
 	}
 	goto __finally3;
 	__catch3_g_error:
 	{
 		GError* _error_ = NULL;
-		SpitPublishingPluginHost* _tmp15_;
+		SpitPublishingPluginHost* _tmp13_;
+		GError* _tmp14_;
+		const gchar* _tmp15_;
 		GError* _tmp16_;
-		const gchar* _tmp17_;
-		GError* _tmp18_;
-		GError* _tmp19_;
+		GError* _tmp17_;
 #line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_error_ = _inner_error_;
 #line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_inner_error_ = NULL;
 #line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp15_ = self->priv->host;
+		_tmp13_ = self->priv->host;
 #line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp16_ = _error_;
+		_tmp14_ = _error_;
 #line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp17_ = _tmp16_->message;
+		_tmp15_ = _tmp14_->message;
 #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_);
+		_tmp16_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp15_);
 #line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp19_ = _tmp18_;
+		_tmp17_ = _tmp16_;
 #line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp15_, _tmp19_);
+		spit_publishing_plugin_host_post_error (_tmp13_, _tmp17_);
 #line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_g_error_free0 (_tmp19_);
+		_g_error_free0 (_tmp17_);
 #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_error_free0 (_error_);
 #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3125 "FacebookPublishing.c"
+#line 3506 "FacebookPublishing.c"
 	}
 	__finally3:
 #line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3137,46 +3518,52 @@ static void publishing_facebook_facebook_publisher_do_add_new_local_album_from_j
 		g_clear_error (&_inner_error_);
 #line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3136 "FacebookPublishing.c"
+#line 3517 "FacebookPublishing.c"
 	}
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp20_ = self->priv->publishing_params;
+	_tmp18_ = self->priv->publishing_params;
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp21_ = album_name;
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishing_facebook_publishing_parameters_set_target_album_by_name (_tmp20_, _tmp21_);
+	publishing_facebook_publishing_parameters_set_target_album_by_name (_tmp18_, album_name);
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_do_upload (self);
-#line 3146 "FacebookPublishing.c"
+#line 3525 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_facebook_publisher_on_authenticator_succeeded (PublishingFacebookFacebookPublisher* self) {
+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 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 3157 "FacebookPublishing.c"
+#line 3538 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_facebook_publisher_on_authenticator_failed (PublishingFacebookFacebookPublisher* self) {
+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 3164 "FacebookPublishing.c"
+#line 3547 "FacebookPublishing.c"
 }
 
 
-static gpointer _g_variant_ref0 (gpointer self) {
+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 3171 "FacebookPublishing.c"
+#line 3556 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_facebook_publisher_do_authenticate_session (PublishingFacebookFacebookPublisher* self) {
+static void
+publishing_facebook_facebook_publisher_do_authenticate_session (PublishingFacebookFacebookPublisher* self)
+{
 	GHashTable* parameter = NULL;
 	SpitPublishingAuthenticator* _tmp0_;
 	GHashTable* _tmp1_;
@@ -3210,7 +3597,7 @@ static void publishing_facebook_facebook_publisher_do_authenticate_session (Publ
 " not provide access token");
 #line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_assert_not_reached ();
-#line 3208 "FacebookPublishing.c"
+#line 3595 "FacebookPublishing.c"
 	}
 #line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = self->priv->graph_session;
@@ -3226,32 +3613,46 @@ static void publishing_facebook_facebook_publisher_do_authenticate_session (Publ
 	_g_variant_unref0 (access_token);
 #line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_hash_table_unref0 (parameter);
-#line 3224 "FacebookPublishing.c"
+#line 3611 "FacebookPublishing.c"
 }
 
 
-static void _publishing_facebook_facebook_publisher_on_upload_complete_publishing_facebook_uploader_upload_complete (PublishingFacebookUploader* _sender, gint num_photos_published, gpointer self) {
+static void
+_publishing_facebook_facebook_publisher_on_upload_complete_publishing_facebook_uploader_upload_complete (PublishingFacebookUploader* _sender,
+                                                                                                         gint num_photos_published,
+                                                                                                         gpointer self)
+{
 #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 3231 "FacebookPublishing.c"
+#line 3622 "FacebookPublishing.c"
 }
 
 
-static void _publishing_facebook_facebook_publisher_on_upload_error_publishing_facebook_uploader_upload_error (PublishingFacebookUploader* _sender, GError* err, gpointer self) {
+static void
+_publishing_facebook_facebook_publisher_on_upload_error_publishing_facebook_uploader_upload_error (PublishingFacebookUploader* _sender,
+                                                                                                   GError* err,
+                                                                                                   gpointer self)
+{
 #line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_upload_error ((PublishingFacebookFacebookPublisher*) self, _sender, err);
-#line 3238 "FacebookPublishing.c"
+#line 3633 "FacebookPublishing.c"
 }
 
 
-static void _publishing_facebook_facebook_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
+static void
+_publishing_facebook_facebook_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number,
+                                                                                                    gdouble fraction_complete,
+                                                                                                    gpointer self)
+{
 #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 3245 "FacebookPublishing.c"
+#line 3644 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_facebook_publisher_do_upload (PublishingFacebookFacebookPublisher* self) {
+static void
+publishing_facebook_facebook_publisher_do_upload (PublishingFacebookFacebookPublisher* self)
+{
 	gchar* _tmp0_ = NULL;
 	PublishingFacebookPublishingParameters* _tmp1_;
 	gint _tmp2_;
@@ -3259,27 +3660,25 @@ static void publishing_facebook_facebook_publisher_do_upload (PublishingFacebook
 	SpitPublishingPluginHost* _tmp7_;
 	PublishingFacebookPublishingParameters* _tmp8_;
 	PublishingFacebookResolution _tmp9_;
-	gint _tmp10_;
-	PublishingFacebookPublishingParameters* _tmp11_;
-	gboolean _tmp12_;
-	void* _tmp13_;
-	GDestroyNotify _tmp14_;
-	SpitPublishingProgressCallback _tmp15_;
-	gboolean _tmp16_;
+	PublishingFacebookPublishingParameters* _tmp10_;
+	gboolean _tmp11_;
+	void* _tmp12_;
+	GDestroyNotify _tmp13_;
+	SpitPublishingProgressCallback _tmp14_;
 	SpitPublishingPublishable** publishables = NULL;
-	SpitPublishingPluginHost* _tmp17_;
-	gint _tmp18_;
-	SpitPublishingPublishable** _tmp19_;
+	SpitPublishingPluginHost* _tmp15_;
+	gint _tmp16_;
+	SpitPublishingPublishable** _tmp17_;
 	gint publishables_length1;
 	gint _publishables_size_;
-	PublishingFacebookGraphSession* _tmp20_;
-	PublishingFacebookPublishingParameters* _tmp21_;
-	SpitPublishingPublishable** _tmp22_;
-	gint _tmp22__length1;
+	PublishingFacebookGraphSession* _tmp18_;
+	PublishingFacebookPublishingParameters* _tmp19_;
+	SpitPublishingPublishable** _tmp20_;
+	gint _tmp20__length1;
+	PublishingFacebookUploader* _tmp21_;
+	PublishingFacebookUploader* _tmp22_;
 	PublishingFacebookUploader* _tmp23_;
 	PublishingFacebookUploader* _tmp24_;
-	PublishingFacebookUploader* _tmp25_;
-	PublishingFacebookUploader* _tmp26_;
 #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3288,7 +3687,7 @@ static void publishing_facebook_facebook_publisher_do_upload (PublishingFacebook
 	_tmp2_ = _tmp1_->target_album;
 #line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp2_ == PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM) {
-#line 3286 "FacebookPublishing.c"
+#line 3685 "FacebookPublishing.c"
 		gchar* _tmp3_;
 #line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp3_ = g_strdup ("(none)");
@@ -3296,7 +3695,7 @@ static void publishing_facebook_facebook_publisher_do_upload (PublishingFacebook
 		_g_free0 (_tmp0_);
 #line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = _tmp3_;
-#line 3294 "FacebookPublishing.c"
+#line 3693 "FacebookPublishing.c"
 	} else {
 		PublishingFacebookPublishingParameters* _tmp4_;
 		gchar* _tmp5_;
@@ -3308,7 +3707,7 @@ static void publishing_facebook_facebook_publisher_do_upload (PublishingFacebook
 		_g_free0 (_tmp0_);
 #line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = _tmp5_;
-#line 3306 "FacebookPublishing.c"
+#line 3705 "FacebookPublishing.c"
 	}
 #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_debug ("FacebookPublishing.vala:402: ACTION: uploading photos to album '%s'", _tmp0_);
@@ -3323,13 +3722,11 @@ static void publishing_facebook_facebook_publisher_do_upload (PublishingFacebook
 #line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp9_ = _tmp8_->resolution;
 #line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp10_ = publishing_facebook_resolution_get_pixels (_tmp9_);
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp11_ = self->priv->publishing_params;
+	_tmp10_ = self->priv->publishing_params;
 #line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp12_ = _tmp11_->strip_metadata;
+	_tmp11_ = _tmp10_->strip_metadata;
 #line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp15_ = spit_publishing_plugin_host_serialize_publishables (_tmp7_, _tmp10_, _tmp12_, &_tmp13_, &_tmp14_);
+	_tmp14_ = spit_publishing_plugin_host_serialize_publishables (_tmp7_, publishing_facebook_resolution_get_pixels (_tmp9_), _tmp11_, &_tmp12_, &_tmp13_);
 #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 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3339,66 +3736,66 @@ static void publishing_facebook_facebook_publisher_do_upload (PublishingFacebook
 #line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = NULL;
 #line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->progress_reporter = _tmp15_;
+	self->priv->progress_reporter = _tmp14_;
 #line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->progress_reporter_target = _tmp13_;
+	self->priv->progress_reporter_target = _tmp12_;
 #line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->progress_reporter_target_destroy_notify = _tmp14_;
+	self->priv->progress_reporter_target_destroy_notify = _tmp13_;
 #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 415 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (!_tmp16_) {
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp0_);
 #line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3350 "FacebookPublishing.c"
+#line 3745 "FacebookPublishing.c"
 	}
 #line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp17_ = self->priv->host;
+	_tmp15_ = self->priv->host;
 #line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp19_ = spit_publishing_plugin_host_get_publishables (_tmp17_, &_tmp18_);
+	_tmp17_ = spit_publishing_plugin_host_get_publishables (_tmp15_, &_tmp16_);
 #line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishables = _tmp19_;
+	publishables = _tmp17_;
 #line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishables_length1 = _tmp18_;
+	publishables_length1 = _tmp16_;
 #line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishables_size_ = publishables_length1;
 #line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp20_ = self->priv->graph_session;
+	_tmp18_ = self->priv->graph_session;
 #line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp21_ = self->priv->publishing_params;
+	_tmp19_ = self->priv->publishing_params;
 #line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp22_ = publishables;
+	_tmp20_ = publishables;
 #line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp22__length1 = publishables_length1;
+	_tmp20__length1 = publishables_length1;
 #line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp23_ = publishing_facebook_uploader_new (_tmp20_, _tmp21_, _tmp22_, _tmp22__length1);
+	_tmp21_ = publishing_facebook_uploader_new (_tmp18_, _tmp19_, _tmp20_, _tmp20__length1);
 #line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_uploader_unref0 (self->priv->uploader);
 #line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->uploader = _tmp23_;
+	self->priv->uploader = _tmp21_;
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp24_ = self->priv->uploader;
+	_tmp22_ = self->priv->uploader;
 #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);
+	g_signal_connect_object (_tmp22_, "upload-complete", (GCallback) _publishing_facebook_facebook_publisher_on_upload_complete_publishing_facebook_uploader_upload_complete, self, 0);
 #line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp25_ = self->priv->uploader;
+	_tmp23_ = self->priv->uploader;
 #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);
+	g_signal_connect_object (_tmp23_, "upload-error", (GCallback) _publishing_facebook_facebook_publisher_on_upload_error_publishing_facebook_uploader_upload_error, self, 0);
 #line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp26_ = self->priv->uploader;
+	_tmp24_ = self->priv->uploader;
 #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);
+	publishing_facebook_uploader_upload (_tmp24_, _publishing_facebook_facebook_publisher_on_upload_status_updated_spit_publishing_progress_callback, self);
 #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp0_);
-#line 3392 "FacebookPublishing.c"
+#line 3787 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_facebook_publisher_do_show_success_pane (PublishingFacebookFacebookPublisher* self) {
+static void
+publishing_facebook_facebook_publisher_do_show_success_pane (PublishingFacebookFacebookPublisher* self)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	SpitPublishingPluginHost* _tmp1_;
 #line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3413,41 +3810,38 @@ static void publishing_facebook_facebook_publisher_do_show_success_pane (Publish
 	_tmp1_ = self->priv->host;
 #line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spit_publishing_plugin_host_install_success_pane (_tmp1_);
-#line 3411 "FacebookPublishing.c"
+#line 3808 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_facebook_publisher_on_generic_error (PublishingFacebookFacebookPublisher* self, GError* _error_) {
-	GError* _tmp0_;
+static void
+publishing_facebook_facebook_publisher_on_generic_error (PublishingFacebookFacebookPublisher* self,
+                                                         GError* _error_)
+{
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = _error_;
-#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)) {
+	if (g_error_matches (_error_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_EXPIRED_SESSION)) {
 #line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_facebook_publisher_do_logout (self);
-#line 3425 "FacebookPublishing.c"
+#line 3822 "FacebookPublishing.c"
 	} else {
-		SpitPublishingPluginHost* _tmp1_;
-		GError* _tmp2_;
-#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp1_ = self->priv->host;
+		SpitPublishingPluginHost* _tmp0_;
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp2_ = _error_;
+		_tmp0_ = self->priv->host;
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp1_, _tmp2_);
-#line 3435 "FacebookPublishing.c"
+		spit_publishing_plugin_host_post_error (_tmp0_, _error_);
+#line 3829 "FacebookPublishing.c"
 	}
 }
 
 
-static void publishing_facebook_facebook_publisher_on_session_authenticated (PublishingFacebookFacebookPublisher* self) {
+static void
+publishing_facebook_facebook_publisher_on_session_authenticated (PublishingFacebookFacebookPublisher* self)
+{
 	PublishingFacebookGraphSession* _tmp0_;
 	guint _tmp1_;
-	gboolean _tmp2_;
-	PublishingFacebookGraphSession* _tmp3_;
-	gboolean _tmp4_;
+	PublishingFacebookGraphSession* _tmp2_;
 #line 469 "/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"
@@ -3457,297 +3851,252 @@ static void publishing_facebook_facebook_publisher_on_session_authenticated (Pub
 #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 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 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (!_tmp2_) {
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3460 "FacebookPublishing.c"
+#line 3852 "FacebookPublishing.c"
 	}
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp3_ = self->priv->graph_session;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp4_ = publishing_facebook_graph_session_is_authenticated (_tmp3_);
+	_tmp2_ = self->priv->graph_session;
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_vala_assert (_tmp4_, "graph_session.is_authenticated()");
+	_vala_assert (publishing_facebook_graph_session_is_authenticated (_tmp2_), "graph_session.is_authenticated()");
 #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 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_do_fetch_user_info (self);
-#line 3472 "FacebookPublishing.c"
+#line 3862 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_facebook_publisher_on_fetch_user_info_completed (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message) {
-	PublishingFacebookGraphMessage* _tmp0_;
+static void
+publishing_facebook_facebook_publisher_on_fetch_user_info_completed (PublishingFacebookFacebookPublisher* self,
+                                                                     PublishingFacebookGraphMessage* message)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingFacebookGraphMessage* _tmp2_;
-	guint _tmp3_;
-	gboolean _tmp4_;
-	PublishingFacebookGraphMessage* _tmp5_;
-	gchar* _tmp6_;
-	gchar* _tmp7_;
-	PublishingFacebookGraphMessage* _tmp8_;
-	gchar* _tmp9_;
-	gchar* _tmp10_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
 #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = message;
+	g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp0_, NULL, FALSE);
 #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 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 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = message;
+	g_signal_handlers_disconnect_matched (message, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_fetch_user_info_completed_publishing_facebook_graph_message_completed, self);
 #line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp3_, NULL, FALSE);
+	g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
 #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);
+	g_signal_handlers_disconnect_matched (message, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_fetch_user_info_error_publishing_facebook_graph_message_failed, self);
 #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 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (!_tmp4_) {
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3510 "FacebookPublishing.c"
+#line 3892 "FacebookPublishing.c"
 	}
 #line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = message;
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp6_ = publishing_facebook_graph_message_get_response_body (_tmp5_);
+	_tmp2_ = publishing_facebook_graph_message_get_response_body (message);
 #line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp7_ = _tmp6_;
+	_tmp3_ = _tmp2_;
 #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_);
+"e = '%s'.", _tmp3_);
 #line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (_tmp7_);
-#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp8_ = message;
+	_g_free0 (_tmp3_);
 #line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp9_ = publishing_facebook_graph_message_get_response_body (_tmp8_);
+	_tmp4_ = publishing_facebook_graph_message_get_response_body (message);
 #line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp10_ = _tmp9_;
+	_tmp5_ = _tmp4_;
 #line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishing_facebook_facebook_publisher_do_extract_user_info_from_json (self, _tmp10_);
+	publishing_facebook_facebook_publisher_do_extract_user_info_from_json (self, _tmp5_);
 #line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (_tmp10_);
-#line 3532 "FacebookPublishing.c"
+	_g_free0 (_tmp5_);
+#line 3910 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_facebook_publisher_on_fetch_user_info_error (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message, GError* _error_) {
-	PublishingFacebookGraphMessage* _tmp0_;
+static void
+publishing_facebook_facebook_publisher_on_fetch_user_info_error (PublishingFacebookFacebookPublisher* self,
+                                                                 PublishingFacebookGraphMessage* message,
+                                                                 GError* _error_)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingFacebookGraphMessage* _tmp2_;
-	guint _tmp3_;
-	gboolean _tmp4_;
-	GError* _tmp5_;
 #line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
 #line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = message;
-#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
+	g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp0_, NULL, FALSE);
 #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);
+	g_signal_handlers_disconnect_matched (message, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_fetch_user_info_completed_publishing_facebook_graph_message_completed, self);
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = message;
+	g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
 #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 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 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));
+	g_signal_handlers_disconnect_matched (message, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_fetch_user_info_error_publishing_facebook_graph_message_failed, self);
 #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (!_tmp4_) {
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3565 "FacebookPublishing.c"
+#line 3937 "FacebookPublishing.c"
 	}
 #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 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = _error_;
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishing_facebook_facebook_publisher_on_generic_error (self, _tmp5_);
-#line 3573 "FacebookPublishing.c"
+	publishing_facebook_facebook_publisher_on_generic_error (self, _error_);
+#line 3943 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_facebook_publisher_on_user_info_extracted (PublishingFacebookFacebookPublisher* self) {
-	gboolean _tmp0_;
+static void
+publishing_facebook_facebook_publisher_on_user_info_extracted (PublishingFacebookFacebookPublisher* self)
+{
+	const gchar* _tmp0_;
 	const gchar* _tmp1_;
-	const gchar* _tmp2_;
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #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 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (!_tmp0_) {
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3589 "FacebookPublishing.c"
+#line 3958 "FacebookPublishing.c"
 	}
 #line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = self->priv->uid;
+	_tmp0_ = self->priv->uid;
 #line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = self->priv->username;
+	_tmp1_ = self->priv->username;
 #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_);
+"onse: uid = %s; name = %s.", _tmp0_, _tmp1_);
 #line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_do_fetch_album_descriptions (self);
-#line 3599 "FacebookPublishing.c"
+#line 3968 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_facebook_publisher_on_fetch_albums_completed (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message) {
-	PublishingFacebookGraphMessage* _tmp0_;
+static void
+publishing_facebook_facebook_publisher_on_fetch_albums_completed (PublishingFacebookFacebookPublisher* self,
+                                                                  PublishingFacebookGraphMessage* message)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingFacebookGraphMessage* _tmp2_;
-	guint _tmp3_;
-	gboolean _tmp4_;
-	PublishingFacebookGraphMessage* _tmp5_;
-	gchar* _tmp6_;
-	gchar* _tmp7_;
-	PublishingFacebookGraphMessage* _tmp8_;
-	gchar* _tmp9_;
-	gchar* _tmp10_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
 #line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
 #line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = message;
-#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
+	g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp0_, NULL, FALSE);
 #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 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = message;
+	g_signal_handlers_disconnect_matched (message, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_fetch_albums_completed_publishing_facebook_graph_message_completed, self);
 #line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp3_, NULL, FALSE);
+	g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
 #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 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));
+	g_signal_handlers_disconnect_matched (message, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_fetch_albums_error_publishing_facebook_graph_message_failed, self);
 #line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (!_tmp4_) {
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3637 "FacebookPublishing.c"
+#line 3998 "FacebookPublishing.c"
 	}
 #line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = message;
+	_tmp2_ = publishing_facebook_graph_message_get_response_body (message);
 #line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp6_ = publishing_facebook_graph_message_get_response_body (_tmp5_);
-#line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp7_ = _tmp6_;
+	_tmp3_ = _tmp2_;
 #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_);
+"on completed; response = '%s'.", _tmp3_);
 #line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (_tmp7_);
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp8_ = message;
+	_g_free0 (_tmp3_);
 #line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp9_ = publishing_facebook_graph_message_get_response_body (_tmp8_);
+	_tmp4_ = publishing_facebook_graph_message_get_response_body (message);
 #line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp10_ = _tmp9_;
+	_tmp5_ = _tmp4_;
 #line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishing_facebook_facebook_publisher_do_extract_albums_from_json (self, _tmp10_);
+	publishing_facebook_facebook_publisher_do_extract_albums_from_json (self, _tmp5_);
 #line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (_tmp10_);
-#line 3659 "FacebookPublishing.c"
+	_g_free0 (_tmp5_);
+#line 4016 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_facebook_publisher_on_fetch_albums_error (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message, GError* err) {
-	PublishingFacebookGraphMessage* _tmp0_;
+static void
+publishing_facebook_facebook_publisher_on_fetch_albums_error (PublishingFacebookFacebookPublisher* self,
+                                                              PublishingFacebookGraphMessage* message,
+                                                              GError* err)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingFacebookGraphMessage* _tmp2_;
-	guint _tmp3_;
-	gboolean _tmp4_;
-	GError* _tmp5_;
 #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
 #line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = message;
-#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
+	g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp0_, NULL, FALSE);
 #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);
+	g_signal_handlers_disconnect_matched (message, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_fetch_albums_completed_publishing_facebook_graph_message_completed, self);
 #line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = message;
+	g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
 #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 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 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));
+	g_signal_handlers_disconnect_matched (message, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_fetch_albums_error_publishing_facebook_graph_message_failed, self);
 #line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (!_tmp4_) {
+	if (!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"
 		return;
-#line 3692 "FacebookPublishing.c"
+#line 4043 "FacebookPublishing.c"
 	}
 #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 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = err;
-#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishing_facebook_facebook_publisher_on_generic_error (self, _tmp5_);
-#line 3700 "FacebookPublishing.c"
+	publishing_facebook_facebook_publisher_on_generic_error (self, err);
+#line 4049 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_facebook_publisher_on_albums_extracted (PublishingFacebookFacebookPublisher* self) {
-	gboolean _tmp0_;
-	PublishingFacebookPublishingParameters* _tmp1_;
-	PublishingFacebookAlbum** _tmp2_;
-	gint _tmp2__length1;
+static void
+publishing_facebook_facebook_publisher_on_albums_extracted (PublishingFacebookFacebookPublisher* self)
+{
+	PublishingFacebookPublishingParameters* _tmp0_;
+	PublishingFacebookAlbum** _tmp1_;
+	gint _tmp1__length1;
 #line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #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 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (!_tmp0_) {
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3717 "FacebookPublishing.c"
+#line 4065 "FacebookPublishing.c"
 	}
 #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = self->priv->publishing_params;
+	_tmp0_ = self->priv->publishing_params;
 #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = _tmp1_->albums;
+	_tmp1_ = _tmp0_->albums;
 #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2__length1 = _tmp1_->albums_length1;
+	_tmp1__length1 = _tmp0_->albums_length1;
 #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);
+"rom JSON response", _tmp1__length1);
 #line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_do_show_publishing_options_pane (self);
-#line 3729 "FacebookPublishing.c"
+#line 4077 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_facebook_publisher_on_publishing_options_pane_logout (PublishingFacebookFacebookPublisher* self) {
+static void
+publishing_facebook_facebook_publisher_on_publishing_options_pane_logout (PublishingFacebookFacebookPublisher* self)
+{
 	PublishingFacebookPublishingOptionsPane* _tmp0_;
 	guint _tmp1_;
 	PublishingFacebookPublishingOptionsPane* _tmp2_;
 	guint _tmp3_;
-	gboolean _tmp4_;
 #line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3763,38 +4112,35 @@ static void publishing_facebook_facebook_publisher_on_publishing_options_pane_lo
 #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 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 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (!_tmp4_) {
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3759 "FacebookPublishing.c"
+#line 4106 "FacebookPublishing.c"
 	}
 #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 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_do_logout (self);
-#line 3765 "FacebookPublishing.c"
+#line 4112 "FacebookPublishing.c"
 }
 
 
-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) {
+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)
+{
 	PublishingFacebookPublishingOptionsPane* _tmp0_;
 	guint _tmp1_;
 	PublishingFacebookPublishingOptionsPane* _tmp2_;
 	guint _tmp3_;
-	gboolean _tmp4_;
+	PublishingFacebookPublishingParameters* _tmp4_;
 	PublishingFacebookPublishingParameters* _tmp5_;
-	gboolean _tmp6_;
-	gboolean _tmp7_;
-	PublishingFacebookPublishingParameters* _tmp8_;
-	PublishingFacebookResolution _tmp9_;
-	PublishingFacebookResolution _tmp10_;
-	PublishingFacebookPublishingParameters* _tmp11_;
-	const gchar* _tmp12_;
-	gchar* _tmp13_;
-	const gchar* _tmp14_;
+	PublishingFacebookPublishingParameters* _tmp6_;
+	gchar* _tmp7_;
 #line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -3812,351 +4158,286 @@ static void publishing_facebook_facebook_publisher_on_publishing_options_pane_pu
 #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 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 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (!_tmp4_) {
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3807 "FacebookPublishing.c"
+#line 4151 "FacebookPublishing.c"
 	}
 #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 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = self->priv->publishing_params;
-#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp6_ = strip_metadata;
+	_tmp4_ = self->priv->publishing_params;
 #line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_->strip_metadata = _tmp6_;
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp7_ = strip_metadata;
+	_tmp4_->strip_metadata = strip_metadata;
 #line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishing_facebook_facebook_publisher_set_persistent_strip_metadata (self, _tmp7_);
+	publishing_facebook_facebook_publisher_set_persistent_strip_metadata (self, strip_metadata);
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp8_ = self->priv->publishing_params;
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp9_ = resolution;
+	_tmp5_ = self->priv->publishing_params;
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp8_->resolution = _tmp9_;
+	_tmp5_->resolution = resolution;
 #line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp10_ = resolution;
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishing_facebook_facebook_publisher_set_persistent_default_size (self, (gint) _tmp10_);
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp11_ = self->priv->publishing_params;
+	publishing_facebook_facebook_publisher_set_persistent_default_size (self, (gint) resolution);
 #line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp12_ = privacy_setting;
+	_tmp6_ = self->priv->publishing_params;
 #line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp13_ = g_strdup (_tmp12_);
+	_tmp7_ = g_strdup (privacy_setting);
 #line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (_tmp11_->privacy_object);
+	_g_free0 (_tmp6_->privacy_object);
 #line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp11_->privacy_object = _tmp13_;
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp14_ = target_album;
+	_tmp6_->privacy_object = _tmp7_;
 #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp14_ != NULL) {
-#line 3845 "FacebookPublishing.c"
-		PublishingFacebookPublishingParameters* _tmp15_;
-		const gchar* _tmp16_;
-		PublishingFacebookPublishingParameters* _tmp17_;
-		gint _tmp18_;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp15_ = self->priv->publishing_params;
+	if (target_album != NULL) {
+#line 4177 "FacebookPublishing.c"
+		PublishingFacebookPublishingParameters* _tmp8_;
+		PublishingFacebookPublishingParameters* _tmp9_;
+		gint _tmp10_;
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp16_ = target_album;
+		_tmp8_ = self->priv->publishing_params;
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		publishing_facebook_publishing_parameters_set_target_album_by_name (_tmp15_, _tmp16_);
+		publishing_facebook_publishing_parameters_set_target_album_by_name (_tmp8_, target_album);
 #line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp17_ = self->priv->publishing_params;
+		_tmp9_ = self->priv->publishing_params;
 #line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp18_ = _tmp17_->target_album;
+		_tmp10_ = _tmp9_->target_album;
 #line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		if (_tmp18_ != PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM) {
+		if (_tmp10_ != PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM) {
 #line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			publishing_facebook_facebook_publisher_do_upload (self);
-#line 3864 "FacebookPublishing.c"
+#line 4193 "FacebookPublishing.c"
 		} else {
-			PublishingFacebookPublishingParameters* _tmp19_;
-			const gchar* _tmp20_;
-			gchar* _tmp21_;
-#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp19_ = self->priv->publishing_params;
+			PublishingFacebookPublishingParameters* _tmp11_;
+			gchar* _tmp12_;
 #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp20_ = target_album;
+			_tmp11_ = self->priv->publishing_params;
 #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp21_ = g_strdup (_tmp20_);
+			_tmp12_ = g_strdup (target_album);
 #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_g_free0 (_tmp19_->new_album_name);
+			_g_free0 (_tmp11_->new_album_name);
 #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp19_->new_album_name = _tmp21_;
+			_tmp11_->new_album_name = _tmp12_;
 #line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			publishing_facebook_facebook_publisher_do_create_new_album (self);
-#line 3881 "FacebookPublishing.c"
+#line 4207 "FacebookPublishing.c"
 		}
 	} else {
 #line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_facebook_publisher_do_upload (self);
-#line 3886 "FacebookPublishing.c"
+#line 4212 "FacebookPublishing.c"
 	}
 }
 
 
-static void publishing_facebook_facebook_publisher_on_create_album_completed (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message) {
-	PublishingFacebookGraphMessage* _tmp0_;
+static void
+publishing_facebook_facebook_publisher_on_create_album_completed (PublishingFacebookFacebookPublisher* self,
+                                                                  PublishingFacebookGraphMessage* message)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingFacebookGraphMessage* _tmp2_;
-	guint _tmp3_;
-	PublishingFacebookPublishingParameters* _tmp4_;
-	const gchar* _tmp5_;
-	gboolean _tmp6_;
-	PublishingFacebookGraphMessage* _tmp7_;
+	PublishingFacebookPublishingParameters* _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	PublishingFacebookPublishingParameters* _tmp6_;
+	const gchar* _tmp7_;
 	gchar* _tmp8_;
 	gchar* _tmp9_;
-	PublishingFacebookPublishingParameters* _tmp10_;
-	const gchar* _tmp11_;
-	PublishingFacebookGraphMessage* _tmp12_;
-	gchar* _tmp13_;
-	gchar* _tmp14_;
 #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #line 595 "/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"
-	_tmp0_ = message;
+	g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp0_, NULL, FALSE);
 #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 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 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = message;
+	g_signal_handlers_disconnect_matched (message, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_create_album_completed_publishing_facebook_graph_message_completed, self);
 #line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp3_, NULL, FALSE);
+	g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
 #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);
+	g_signal_handlers_disconnect_matched (message, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_create_album_error_publishing_facebook_graph_message_failed, self);
 #line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp4_ = self->priv->publishing_params;
+	_tmp2_ = self->priv->publishing_params;
 #line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = _tmp4_->new_album_name;
+	_tmp3_ = _tmp2_->new_album_name;
 #line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_vala_assert (_tmp5_ != NULL, "publishing_params.new_album_name != null");
-#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));
+	_vala_assert (_tmp3_ != NULL, "publishing_params.new_album_name != null");
 #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (!_tmp6_) {
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3935 "FacebookPublishing.c"
+#line 4253 "FacebookPublishing.c"
 	}
 #line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp7_ = message;
-#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp8_ = publishing_facebook_graph_message_get_response_body (_tmp7_);
+	_tmp4_ = publishing_facebook_graph_message_get_response_body (message);
 #line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp9_ = _tmp8_;
+	_tmp5_ = _tmp4_;
 #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_);
+"te host; response body = %s.\n", _tmp5_);
 #line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (_tmp9_);
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp10_ = self->priv->publishing_params;
+	_g_free0 (_tmp5_);
 #line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp11_ = _tmp10_->new_album_name;
+	_tmp6_ = self->priv->publishing_params;
 #line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp12_ = message;
+	_tmp7_ = _tmp6_->new_album_name;
 #line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp13_ = publishing_facebook_graph_message_get_response_body (_tmp12_);
+	_tmp8_ = publishing_facebook_graph_message_get_response_body (message);
 #line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp14_ = _tmp13_;
+	_tmp9_ = _tmp8_;
 #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_);
+	publishing_facebook_facebook_publisher_do_add_new_local_album_from_json (self, _tmp7_, _tmp9_);
 #line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (_tmp14_);
-#line 3961 "FacebookPublishing.c"
+	_g_free0 (_tmp9_);
+#line 4275 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_facebook_publisher_on_create_album_error (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message, GError* err) {
-	PublishingFacebookGraphMessage* _tmp0_;
+static void
+publishing_facebook_facebook_publisher_on_create_album_error (PublishingFacebookFacebookPublisher* self,
+                                                              PublishingFacebookGraphMessage* message,
+                                                              GError* err)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingFacebookGraphMessage* _tmp2_;
-	guint _tmp3_;
-	gboolean _tmp4_;
-	GError* _tmp5_;
 #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
 #line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = message;
-#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
+	g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp0_, NULL, FALSE);
 #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 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = message;
+	g_signal_handlers_disconnect_matched (message, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_create_album_completed_publishing_facebook_graph_message_completed, self);
 #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp3_, NULL, FALSE);
+	g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
 #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 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));
+	g_signal_handlers_disconnect_matched (message, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_create_album_error_publishing_facebook_graph_message_failed, self);
 #line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (!_tmp4_) {
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3994 "FacebookPublishing.c"
+#line 4302 "FacebookPublishing.c"
 	}
 #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 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = err;
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishing_facebook_facebook_publisher_on_generic_error (self, _tmp5_);
-#line 4002 "FacebookPublishing.c"
+	publishing_facebook_facebook_publisher_on_generic_error (self, err);
+#line 4308 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_facebook_publisher_on_upload_status_updated (PublishingFacebookFacebookPublisher* self, gint file_number, gdouble completed_fraction) {
-	gboolean _tmp0_;
-	gdouble _tmp1_;
-	SpitPublishingProgressCallback _tmp2_;
-	void* _tmp2__target;
-	SpitPublishingProgressCallback _tmp3_;
-	void* _tmp3__target;
-	gint _tmp4_;
-	gdouble _tmp5_;
+static void
+publishing_facebook_facebook_publisher_on_upload_status_updated (PublishingFacebookFacebookPublisher* self,
+                                                                 gint file_number,
+                                                                 gdouble completed_fraction)
+{
+	SpitPublishingProgressCallback _tmp0_;
+	void* _tmp0__target;
+	SpitPublishingProgressCallback _tmp1_;
+	void* _tmp1__target;
 #line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #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 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (!_tmp0_) {
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4023 "FacebookPublishing.c"
+#line 4327 "FacebookPublishing.c"
 	}
 #line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = completed_fraction;
-#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_);
+"nt complete.", 100.0 * completed_fraction);
 #line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = self->priv->progress_reporter;
+	_tmp0_ = self->priv->progress_reporter;
 #line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2__target = self->priv->progress_reporter_target;
+	_tmp0__target = self->priv->progress_reporter_target;
 #line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_vala_assert (_tmp2_ != NULL, "progress_reporter != null");
-#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp3_ = self->priv->progress_reporter;
-#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp3__target = self->priv->progress_reporter_target;
+	_vala_assert (_tmp0_ != NULL, "progress_reporter != null");
 #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp4_ = file_number;
+	_tmp1_ = self->priv->progress_reporter;
 #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = completed_fraction;
+	_tmp1__target = self->priv->progress_reporter_target;
 #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 4045 "FacebookPublishing.c"
+	_tmp1_ (file_number, completed_fraction, _tmp1__target);
+#line 4343 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_facebook_publisher_on_upload_complete (PublishingFacebookFacebookPublisher* self, PublishingFacebookUploader* uploader, gint num_published) {
-	PublishingFacebookUploader* _tmp0_;
+static void
+publishing_facebook_facebook_publisher_on_upload_complete (PublishingFacebookFacebookPublisher* self,
+                                                           PublishingFacebookUploader* uploader,
+                                                           gint num_published)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingFacebookUploader* _tmp2_;
-	guint _tmp3_;
-	gboolean _tmp4_;
-	gint _tmp5_;
 #line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (uploader));
 #line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = uploader;
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_parse_name ("upload-complete", PUBLISHING_FACEBOOK_TYPE_UPLOADER, &_tmp1_, NULL, FALSE);
+	g_signal_parse_name ("upload-complete", PUBLISHING_FACEBOOK_TYPE_UPLOADER, &_tmp0_, NULL, FALSE);
 #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);
+	g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_upload_complete_publishing_facebook_uploader_upload_complete, self);
 #line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = uploader;
+	g_signal_parse_name ("upload-error", PUBLISHING_FACEBOOK_TYPE_UPLOADER, &_tmp1_, NULL, FALSE);
 #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 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 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));
+	g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_upload_error_publishing_facebook_uploader_upload_error, self);
 #line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (!_tmp4_) {
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4078 "FacebookPublishing.c"
+#line 4370 "FacebookPublishing.c"
 	}
 #line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = num_published;
-#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_);
+"%d items published.", num_published);
 #line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_do_show_success_pane (self);
-#line 4086 "FacebookPublishing.c"
+#line 4376 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_facebook_publisher_on_upload_error (PublishingFacebookFacebookPublisher* self, PublishingFacebookUploader* uploader, GError* err) {
-	PublishingFacebookUploader* _tmp0_;
+static void
+publishing_facebook_facebook_publisher_on_upload_error (PublishingFacebookFacebookPublisher* self,
+                                                        PublishingFacebookUploader* uploader,
+                                                        GError* err)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingFacebookUploader* _tmp2_;
-	guint _tmp3_;
-	gboolean _tmp4_;
-	GError* _tmp5_;
-	const gchar* _tmp6_;
-	SpitPublishingPluginHost* _tmp7_;
-	GError* _tmp8_;
+	const gchar* _tmp2_;
+	SpitPublishingPluginHost* _tmp3_;
 #line 646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
 #line 646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (uploader));
 #line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = uploader;
+	g_signal_parse_name ("upload-complete", PUBLISHING_FACEBOOK_TYPE_UPLOADER, &_tmp0_, NULL, FALSE);
 #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 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 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = uploader;
+	g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_upload_complete_publishing_facebook_uploader_upload_complete, self);
 #line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_parse_name ("upload-error", PUBLISHING_FACEBOOK_TYPE_UPLOADER, &_tmp3_, NULL, FALSE);
+	g_signal_parse_name ("upload-error", PUBLISHING_FACEBOOK_TYPE_UPLOADER, &_tmp1_, NULL, FALSE);
 #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 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));
+	g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_upload_error_publishing_facebook_uploader_upload_error, self);
 #line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (!_tmp4_) {
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4122 "FacebookPublishing.c"
+#line 4405 "FacebookPublishing.c"
 	}
 #line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = err;
-#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp6_ = _tmp5_->message;
+	_tmp2_ = err->message;
 #line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_debug ("FacebookPublishing.vala:653: EVENT: uploader reports upload error = '%" \
-"s'.", _tmp6_);
-#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp7_ = self->priv->host;
+"s'.", _tmp2_);
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp8_ = err;
+	_tmp3_ = self->priv->host;
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 4136 "FacebookPublishing.c"
+	spit_publishing_plugin_host_post_error (_tmp3_, err);
+#line 4415 "FacebookPublishing.c"
 }
 
 
-static SpitPublishingService* publishing_facebook_facebook_publisher_real_get_service (SpitPublishingPublisher* base) {
+static SpitPublishingService*
+publishing_facebook_facebook_publisher_real_get_service (SpitPublishingPublisher* base)
+{
 	PublishingFacebookFacebookPublisher * self;
 	SpitPublishingService* result = NULL;
 	SpitPublishingService* _tmp0_;
@@ -4171,11 +4452,13 @@ static SpitPublishingService* publishing_facebook_facebook_publisher_real_get_se
 	result = _tmp1_;
 #line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 4155 "FacebookPublishing.c"
+#line 4436 "FacebookPublishing.c"
 }
 
 
-gchar* publishing_facebook_facebook_publisher_get_service_name (PublishingFacebookFacebookPublisher* self) {
+gchar*
+publishing_facebook_facebook_publisher_get_service_name (PublishingFacebookFacebookPublisher* self)
+{
 	gchar* result = NULL;
 	gchar* _tmp0_;
 #line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -4186,11 +4469,13 @@ gchar* publishing_facebook_facebook_publisher_get_service_name (PublishingFacebo
 	result = _tmp0_;
 #line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 4170 "FacebookPublishing.c"
+#line 4453 "FacebookPublishing.c"
 }
 
 
-gchar* publishing_facebook_facebook_publisher_get_user_visible_name (PublishingFacebookFacebookPublisher* self) {
+gchar*
+publishing_facebook_facebook_publisher_get_user_visible_name (PublishingFacebookFacebookPublisher* self)
+{
 	gchar* result = NULL;
 	gchar* _tmp0_;
 #line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -4201,68 +4486,75 @@ gchar* publishing_facebook_facebook_publisher_get_user_visible_name (PublishingF
 	result = _tmp0_;
 #line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 4185 "FacebookPublishing.c"
+#line 4470 "FacebookPublishing.c"
 }
 
 
-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_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 4192 "FacebookPublishing.c"
+#line 4480 "FacebookPublishing.c"
 }
 
 
-static void _publishing_facebook_facebook_publisher_on_authenticator_failed_spit_publishing_authenticator_authentication_failed (SpitPublishingAuthenticator* _sender, gpointer self) {
+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 4199 "FacebookPublishing.c"
+#line 4490 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_facebook_publisher_real_start (SpitPublishingPublisher* base) {
+static void
+publishing_facebook_facebook_publisher_real_start (SpitPublishingPublisher* base)
+{
 	PublishingFacebookFacebookPublisher * self;
-	gboolean _tmp0_;
-	PublishingFacebookPublishingParameters* _tmp1_;
+	PublishingFacebookPublishingParameters* _tmp0_;
+	SpitPublishingAuthenticator* _tmp1_;
 	SpitPublishingAuthenticator* _tmp2_;
 	SpitPublishingAuthenticator* _tmp3_;
-	SpitPublishingAuthenticator* _tmp4_;
 #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 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 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp0_) {
+	if (spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4218 "FacebookPublishing.c"
+#line 4508 "FacebookPublishing.c"
 	}
 #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 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = publishing_facebook_publishing_parameters_new ();
+	_tmp0_ = publishing_facebook_publishing_parameters_new ();
 #line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_publishing_parameters_unref0 (self->priv->publishing_params);
 #line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->publishing_params = _tmp1_;
+	self->priv->publishing_params = _tmp0_;
 #line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = self->priv->authenticator;
+	_tmp1_ = 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);
+	g_signal_connect_object (_tmp1_, "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;
+	_tmp2_ = 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);
+	g_signal_connect_object (_tmp2_, "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;
+	_tmp3_ = self->priv->authenticator;
 #line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	spit_publishing_authenticator_authenticate (_tmp4_);
-#line 4242 "FacebookPublishing.c"
+	spit_publishing_authenticator_authenticate (_tmp3_);
+#line 4532 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_facebook_publisher_real_stop (SpitPublishingPublisher* base) {
+static void
+publishing_facebook_facebook_publisher_real_stop (SpitPublishingPublisher* base)
+{
 	PublishingFacebookFacebookPublisher * self;
 	PublishingFacebookGraphSession* _tmp0_;
 #line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -4273,23 +4565,25 @@ static void publishing_facebook_facebook_publisher_real_stop (SpitPublishingPubl
 	_tmp0_ = self->priv->graph_session;
 #line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp0_ != NULL) {
-#line 4257 "FacebookPublishing.c"
+#line 4549 "FacebookPublishing.c"
 		PublishingFacebookGraphSession* _tmp1_;
 #line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp1_ = self->priv->graph_session;
 #line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_session_stop_transactions (_tmp1_);
-#line 4263 "FacebookPublishing.c"
+#line 4555 "FacebookPublishing.c"
 	}
 #line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->host = NULL;
 #line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->running = FALSE;
-#line 4269 "FacebookPublishing.c"
+#line 4561 "FacebookPublishing.c"
 }
 
 
-static gboolean publishing_facebook_facebook_publisher_real_is_running (SpitPublishingPublisher* base) {
+static gboolean
+publishing_facebook_facebook_publisher_real_is_running (SpitPublishingPublisher* base)
+{
 	PublishingFacebookFacebookPublisher * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_;
@@ -4301,22 +4595,26 @@ static gboolean publishing_facebook_facebook_publisher_real_is_running (SpitPubl
 	result = _tmp0_;
 #line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 4285 "FacebookPublishing.c"
+#line 4579 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_facebook_publisher_class_init (PublishingFacebookFacebookPublisherClass * klass) {
+static void
+publishing_facebook_facebook_publisher_class_init (PublishingFacebookFacebookPublisherClass * klass)
+{
 #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_parent_class = g_type_class_peek_parent (klass);
 #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFacebookFacebookPublisherPrivate));
 #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_facebook_facebook_publisher_finalize;
-#line 4296 "FacebookPublishing.c"
+#line 4592 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_facebook_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface) {
+static void
+publishing_facebook_facebook_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface)
+{
 #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 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -4327,11 +4625,13 @@ static void publishing_facebook_facebook_publisher_spit_publishing_publisher_int
 	iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_facebook_facebook_publisher_real_stop;
 #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	iface->is_running = (gboolean (*) (SpitPublishingPublisher *)) publishing_facebook_facebook_publisher_real_is_running;
-#line 4311 "FacebookPublishing.c"
+#line 4609 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_facebook_publisher_instance_init (PublishingFacebookFacebookPublisher * self) {
+static void
+publishing_facebook_facebook_publisher_instance_init (PublishingFacebookFacebookPublisher * self)
+{
 #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv = PUBLISHING_FACEBOOK_FACEBOOK_PUBLISHER_GET_PRIVATE (self);
 #line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -4356,11 +4656,13 @@ static void publishing_facebook_facebook_publisher_instance_init (PublishingFace
 	self->priv->uid = NULL;
 #line 179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->username = NULL;
-#line 4340 "FacebookPublishing.c"
+#line 4640 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_facebook_publisher_finalize (GObject * obj) {
+static void
+publishing_facebook_facebook_publisher_finalize (GObject * obj)
+{
 	PublishingFacebookFacebookPublisher * self;
 #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_FACEBOOK_PUBLISHER, PublishingFacebookFacebookPublisher);
@@ -4388,11 +4690,13 @@ static void publishing_facebook_facebook_publisher_finalize (GObject * obj) {
 	_g_free0 (self->priv->username);
 #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_OBJECT_CLASS (publishing_facebook_facebook_publisher_parent_class)->finalize (obj);
-#line 4372 "FacebookPublishing.c"
+#line 4674 "FacebookPublishing.c"
 }
 
 
-GType publishing_facebook_facebook_publisher_get_type (void) {
+GType
+publishing_facebook_facebook_publisher_get_type (void)
+{
 	static volatile gsize publishing_facebook_facebook_publisher_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_facebook_facebook_publisher_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingFacebookFacebookPublisherClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_facebook_facebook_publisher_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFacebookFacebookPublisher), 0, (GInstanceInitFunc) publishing_facebook_facebook_publisher_instance_init, NULL };
@@ -4406,139 +4710,151 @@ GType publishing_facebook_facebook_publisher_get_type (void) {
 }
 
 
-static PublishingFacebookAlbum** _vala_array_dup2 (PublishingFacebookAlbum** self, int length) {
+static PublishingFacebookAlbum**
+_vala_array_dup2 (PublishingFacebookAlbum** self,
+                  int length)
+{
 	PublishingFacebookAlbum** result;
 	int i;
 #line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = g_new0 (PublishingFacebookAlbum*, length + 1);
 #line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 4397 "FacebookPublishing.c"
+#line 4704 "FacebookPublishing.c"
 		PublishingFacebookAlbum* _tmp0_;
 #line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = _publishing_facebook_album_ref0 (self[i]);
 #line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		result[i] = _tmp0_;
-#line 4403 "FacebookPublishing.c"
+#line 4710 "FacebookPublishing.c"
 	}
 #line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 4407 "FacebookPublishing.c"
+#line 4714 "FacebookPublishing.c"
 }
 
 
-static void _publishing_facebook_publishing_options_pane_on_create_new_toggled_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_facebook_publishing_options_pane_on_create_new_toggled_gtk_button_clicked (GtkButton* _sender,
+                                                                                       gpointer self)
+{
 #line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_on_create_new_toggled ((PublishingFacebookPublishingOptionsPane*) self);
-#line 4414 "FacebookPublishing.c"
+#line 4724 "FacebookPublishing.c"
 }
 
 
-static void _publishing_facebook_publishing_options_pane_on_use_existing_toggled_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_facebook_publishing_options_pane_on_use_existing_toggled_gtk_button_clicked (GtkButton* _sender,
+                                                                                         gpointer self)
+{
 #line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_on_use_existing_toggled ((PublishingFacebookPublishingOptionsPane*) self);
-#line 4421 "FacebookPublishing.c"
+#line 4734 "FacebookPublishing.c"
 }
 
 
-static void _publishing_facebook_publishing_options_pane_on_publish_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_facebook_publishing_options_pane_on_publish_button_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                           gpointer self)
+{
 #line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_on_publish_button_clicked ((PublishingFacebookPublishingOptionsPane*) self);
-#line 4428 "FacebookPublishing.c"
+#line 4744 "FacebookPublishing.c"
 }
 
 
-static void _publishing_facebook_publishing_options_pane_on_logout_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_facebook_publishing_options_pane_on_logout_button_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                          gpointer self)
+{
 #line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_on_logout_button_clicked ((PublishingFacebookPublishingOptionsPane*) self);
-#line 4435 "FacebookPublishing.c"
+#line 4754 "FacebookPublishing.c"
 }
 
 
-static void _publishing_facebook_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+static void
+_publishing_facebook_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+                                                                                    gpointer self)
+{
 #line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_on_size_changed ((PublishingFacebookPublishingOptionsPane*) self);
-#line 4442 "FacebookPublishing.c"
+#line 4764 "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, 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)
+{
 	PublishingFacebookPublishingOptionsPane * self = NULL;
 	GtkBuilder* _tmp0_;
-	GtkBuilder* _tmp1_;
-	GtkBuilder* _tmp2_;
-	GtkBuilder* _tmp3_;
-	GSList* _tmp4_;
-	GSList* _tmp5_;
-	guint _tmp6_;
-	PublishingFacebookAlbum** _tmp7_;
-	gint _tmp7__length1;
-	PublishingFacebookAlbum** _tmp8_;
-	gint _tmp8__length1;
-	gint _tmp9_;
-	PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp10_;
-	gint _tmp11_;
-	PublishingFacebookResolution* _tmp12_;
-	PublishingFacebookFacebookPublisher* _tmp13_;
-	PublishingFacebookFacebookPublisher* _tmp14_;
-	SpitPublishingPublisherMediaType _tmp15_;
-	GtkBuilder* _tmp16_;
-	GObject* _tmp17_;
-	GtkBox* _tmp18_;
-	GtkBox* _tmp19_;
-	GtkBuilder* _tmp20_;
-	GObject* _tmp21_;
-	GtkRadioButton* _tmp22_;
-	GtkBuilder* _tmp23_;
-	GObject* _tmp24_;
-	GtkRadioButton* _tmp25_;
-	GtkBuilder* _tmp26_;
-	GObject* _tmp27_;
-	GtkComboBoxText* _tmp28_;
-	GtkBuilder* _tmp29_;
-	GObject* _tmp30_;
-	GtkComboBoxText* _tmp31_;
-	GtkBuilder* _tmp32_;
-	GObject* _tmp33_;
-	GtkButton* _tmp34_;
-	GtkBuilder* _tmp35_;
-	GObject* _tmp36_;
-	GtkButton* _tmp37_;
-	gboolean _tmp38_;
+	GSList* _tmp1_;
+	GSList* _tmp2_;
+	PublishingFacebookAlbum** _tmp3_;
+	gint _tmp3__length1;
+	gint _tmp4_;
+	PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp5_;
+	gint _tmp6_;
+	PublishingFacebookResolution* _tmp7_;
+	PublishingFacebookFacebookPublisher* _tmp8_;
+	GObject* _tmp9_;
+	GtkBox* _tmp10_;
+	GtkBox* _tmp11_;
+	GtkBuilder* _tmp12_;
+	GObject* _tmp13_;
+	GtkRadioButton* _tmp14_;
+	GtkBuilder* _tmp15_;
+	GObject* _tmp16_;
+	GtkRadioButton* _tmp17_;
+	GtkBuilder* _tmp18_;
+	GObject* _tmp19_;
+	GtkComboBoxText* _tmp20_;
+	GtkBuilder* _tmp21_;
+	GObject* _tmp22_;
+	GtkComboBoxText* _tmp23_;
+	GtkBuilder* _tmp24_;
+	GObject* _tmp25_;
+	GtkButton* _tmp26_;
+	GtkBuilder* _tmp27_;
+	GObject* _tmp28_;
+	GtkButton* _tmp29_;
+	GtkBuilder* _tmp34_;
+	GObject* _tmp35_;
+	GtkEntry* _tmp36_;
+	GtkBuilder* _tmp37_;
+	GObject* _tmp38_;
+	GtkComboBoxText* _tmp39_;
+	GtkBuilder* _tmp40_;
+	GObject* _tmp41_;
+	GtkLabel* _tmp42_;
 	GtkBuilder* _tmp43_;
 	GObject* _tmp44_;
-	GtkEntry* _tmp45_;
-	GtkBuilder* _tmp46_;
-	GObject* _tmp47_;
-	GtkComboBoxText* _tmp48_;
-	GtkBuilder* _tmp49_;
-	GObject* _tmp50_;
-	GtkLabel* _tmp51_;
-	GtkBuilder* _tmp52_;
-	GObject* _tmp53_;
-	GtkCheckButton* _tmp54_;
-	GtkRadioButton* _tmp55_;
-	GtkRadioButton* _tmp56_;
+	GtkCheckButton* _tmp45_;
+	GtkRadioButton* _tmp46_;
+	GtkRadioButton* _tmp47_;
 	gchar* label_text = NULL;
-	const gchar* _tmp57_;
-	gchar* _tmp58_;
-	SpitPublishingPublisherMediaType _tmp59_;
-	GtkLabel* _tmp62_;
-	const gchar* _tmp63_;
-	GtkCheckButton* _tmp64_;
-	gboolean _tmp65_;
-	GtkComboBoxText* _tmp66_;
-	GtkButton* _tmp67_;
-	GtkButton* _tmp68_;
-	GtkComboBoxText* _tmp69_;
-	PublishingFacebookFacebookPublisher* _tmp70_;
-	gint _tmp71_;
-	GtkComboBoxText* _tmp72_;
-	gboolean _tmp73_ = FALSE;
-	gboolean _tmp74_ = FALSE;
-	GtkRadioButton* _tmp75_;
-	GtkComboBoxText* _tmp80_;
-	SpitPublishingPublisherMediaType _tmp81_;
+	gchar* _tmp48_;
+	GtkLabel* _tmp51_;
+	const gchar* _tmp52_;
+	GtkCheckButton* _tmp53_;
+	GtkComboBoxText* _tmp54_;
+	GtkButton* _tmp55_;
+	GtkButton* _tmp56_;
+	GtkComboBoxText* _tmp57_;
+	GtkComboBoxText* _tmp58_;
+	gboolean _tmp59_ = FALSE;
+	gboolean _tmp60_ = FALSE;
+	GtkRadioButton* _tmp61_;
+	GtkComboBoxText* _tmp65_;
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (username != NULL, NULL);
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -4548,380 +4864,356 @@ PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = (PublishingFacebookPublishingOptionsPane*) g_object_new (object_type, NULL);
 #line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = builder;
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_tmp0_ = _g_object_ref0 (builder);
 #line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->builder);
 #line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->builder = _tmp1_;
-#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = builder;
+	self->priv->builder = _tmp0_;
 #line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_vala_assert (_tmp2_ != NULL, "builder != null");
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp3_ = builder;
+	_vala_assert (builder != NULL, "builder != null");
 #line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp4_ = gtk_builder_get_objects (_tmp3_);
+	_tmp1_ = gtk_builder_get_objects (builder);
 #line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = _tmp4_;
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp6_ = g_slist_length (_tmp5_);
+	_tmp2_ = _tmp1_;
 #line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_vala_assert (_tmp6_ > ((guint) 0), "builder.get_objects().length() > 0");
+	_vala_assert (g_slist_length (_tmp2_) > ((guint) 0), "builder.get_objects().length() > 0");
 #line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_slist_free0 (_tmp5_);
+	_g_slist_free0 (_tmp2_);
 #line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp7_ = albums;
+	_tmp3_ = (albums != NULL) ? _vala_array_dup2 (albums, albums_length1) : ((gpointer) albums);
 #line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp7__length1 = albums_length1;
-#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup2 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_);
-#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp8__length1 = _tmp7__length1;
+	_tmp3__length1 = albums_length1;
 #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 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->albums = _tmp8_;
+	self->priv->albums = _tmp3_;
 #line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->albums_length1 = _tmp8__length1;
+	self->priv->albums_length1 = _tmp3__length1;
 #line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->_albums_size_ = self->priv->albums_length1;
 #line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp10_ = publishing_facebook_publishing_options_pane_create_privacy_descriptions (self, &_tmp9_);
+	_tmp5_ = publishing_facebook_publishing_options_pane_create_privacy_descriptions (self, &_tmp4_);
 #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 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->privacy_descriptions = _tmp10_;
+	self->priv->privacy_descriptions = _tmp5_;
 #line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->privacy_descriptions_length1 = _tmp9_;
+	self->priv->privacy_descriptions_length1 = _tmp4_;
 #line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->_privacy_descriptions_size_ = self->priv->privacy_descriptions_length1;
 #line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp12_ = publishing_facebook_publishing_options_pane_create_resolution_list (self, &_tmp11_);
+	_tmp7_ = publishing_facebook_publishing_options_pane_create_resolution_list (self, &_tmp6_);
 #line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->possible_resolutions = (g_free (self->priv->possible_resolutions), NULL);
 #line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->possible_resolutions = _tmp12_;
+	self->priv->possible_resolutions = _tmp7_;
 #line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->possible_resolutions_length1 = _tmp11_;
+	self->priv->possible_resolutions_length1 = _tmp6_;
 #line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->_possible_resolutions_size_ = self->priv->possible_resolutions_length1;
 #line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp13_ = publisher;
-#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp14_ = _g_object_ref0 (_tmp13_);
+	_tmp8_ = _g_object_ref0 (publisher);
 #line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->publisher);
 #line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->publisher = _tmp14_;
-#line 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp15_ = media_type;
+	self->priv->publisher = _tmp8_;
 #line 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->media_type = _tmp15_;
-#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp16_ = builder;
+	self->priv->media_type = media_type;
 #line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp17_ = gtk_builder_get_object (_tmp16_, "facebook_pane_box");
+	_tmp9_ = gtk_builder_get_object (builder, "facebook_pane_box");
 #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));
+	_tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_box_get_type (), GtkBox));
 #line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->pane_widget);
 #line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->pane_widget = _tmp18_;
+	self->priv->pane_widget = _tmp10_;
 #line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp19_ = self->priv->pane_widget;
+	_tmp11_ = self->priv->pane_widget;
 #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);
+	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_container_get_type (), GtkContainer), (guint) 16);
 #line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp20_ = self->priv->builder;
+	_tmp12_ = self->priv->builder;
 #line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp21_ = gtk_builder_get_object (_tmp20_, "use_existing_radio");
+	_tmp13_ = gtk_builder_get_object (_tmp12_, "use_existing_radio");
 #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));
+	_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_radio_button_get_type (), GtkRadioButton));
 #line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->use_existing_radio);
 #line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->use_existing_radio = _tmp22_;
+	self->priv->use_existing_radio = _tmp14_;
 #line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp23_ = self->priv->builder;
+	_tmp15_ = self->priv->builder;
 #line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp24_ = gtk_builder_get_object (_tmp23_, "create_new_radio");
+	_tmp16_ = gtk_builder_get_object (_tmp15_, "create_new_radio");
 #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));
+	_tmp17_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_radio_button_get_type (), GtkRadioButton));
 #line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->create_new_radio);
 #line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->create_new_radio = _tmp25_;
+	self->priv->create_new_radio = _tmp17_;
 #line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp26_ = self->priv->builder;
+	_tmp18_ = self->priv->builder;
 #line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp27_ = gtk_builder_get_object (_tmp26_, "existing_albums_combo");
+	_tmp19_ = gtk_builder_get_object (_tmp18_, "existing_albums_combo");
 #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));
+	_tmp20_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_combo_box_text_get_type (), GtkComboBoxText));
 #line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->existing_albums_combo);
 #line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->existing_albums_combo = _tmp28_;
+	self->priv->existing_albums_combo = _tmp20_;
 #line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp29_ = self->priv->builder;
+	_tmp21_ = self->priv->builder;
 #line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp30_ = gtk_builder_get_object (_tmp29_, "visibility_combo");
+	_tmp22_ = gtk_builder_get_object (_tmp21_, "visibility_combo");
 #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));
+	_tmp23_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_combo_box_text_get_type (), GtkComboBoxText));
 #line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->visibility_combo);
 #line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->visibility_combo = _tmp31_;
+	self->priv->visibility_combo = _tmp23_;
 #line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp32_ = self->priv->builder;
+	_tmp24_ = self->priv->builder;
 #line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp33_ = gtk_builder_get_object (_tmp32_, "publish_button");
+	_tmp25_ = gtk_builder_get_object (_tmp24_, "publish_button");
 #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));
+	_tmp26_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_button_get_type (), GtkButton));
 #line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->publish_button);
 #line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->publish_button = _tmp34_;
+	self->priv->publish_button = _tmp26_;
 #line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp35_ = self->priv->builder;
+	_tmp27_ = self->priv->builder;
 #line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp36_ = gtk_builder_get_object (_tmp35_, "logout_button");
+	_tmp28_ = gtk_builder_get_object (_tmp27_, "logout_button");
 #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));
+	_tmp29_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_button_get_type (), GtkButton));
 #line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->logout_button);
 #line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->logout_button = _tmp37_;
+	self->priv->logout_button = _tmp29_;
 #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 4681 "FacebookPublishing.c"
-		GtkButton* _tmp39_;
-		GtkContainer* _tmp40_;
-		GtkContainer* _tmp41_;
-		GtkButton* _tmp42_;
+	if (!can_logout) {
+#line 4977 "FacebookPublishing.c"
+		GtkButton* _tmp30_;
+		GtkContainer* _tmp31_;
+		GtkContainer* _tmp32_;
+		GtkButton* _tmp33_;
 #line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp39_ = self->priv->logout_button;
+		_tmp30_ = 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));
+		_tmp31_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget));
 #line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp41_ = _tmp40_;
+		_tmp32_ = _tmp31_;
 #line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp42_ = self->priv->logout_button;
+		_tmp33_ = 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 4696 "FacebookPublishing.c"
+		gtk_container_remove (_tmp32_, G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget));
+#line 4992 "FacebookPublishing.c"
 	}
 #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp43_ = self->priv->builder;
+	_tmp34_ = self->priv->builder;
 #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp44_ = gtk_builder_get_object (_tmp43_, "new_album_entry");
+	_tmp35_ = gtk_builder_get_object (_tmp34_, "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));
+	_tmp36_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, 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 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->new_album_entry = _tmp45_;
+	self->priv->new_album_entry = _tmp36_;
 #line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp46_ = self->priv->builder;
+	_tmp37_ = self->priv->builder;
 #line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp47_ = gtk_builder_get_object (_tmp46_, "resolution_combo");
+	_tmp38_ = gtk_builder_get_object (_tmp37_, "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));
+	_tmp39_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, 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 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->resolution_combo = _tmp48_;
+	self->priv->resolution_combo = _tmp39_;
 #line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp49_ = self->priv->builder;
+	_tmp40_ = self->priv->builder;
 #line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp50_ = gtk_builder_get_object (_tmp49_, "how_to_label");
+	_tmp41_ = gtk_builder_get_object (_tmp40_, "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));
+	_tmp42_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, 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 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->how_to_label = _tmp51_;
+	self->priv->how_to_label = _tmp42_;
 #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp52_ = self->priv->builder;
+	_tmp43_ = self->priv->builder;
 #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp53_ = gtk_builder_get_object (_tmp52_, "strip_metadata_check");
+	_tmp44_ = gtk_builder_get_object (_tmp43_, "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));
+	_tmp45_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, 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 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->strip_metadata_check = _tmp54_;
+	self->priv->strip_metadata_check = _tmp45_;
 #line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp55_ = self->priv->create_new_radio;
+	_tmp46_ = 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);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, 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;
+	_tmp47_ = 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);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, 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;
+	_tmp48_ = g_strdup_printf (PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_HEADER_LABEL_TEXT, 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;
+	label_text = _tmp48_;
 #line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if ((_tmp59_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) {
-#line 4756 "FacebookPublishing.c"
-		const gchar* _tmp60_;
-		gchar* _tmp61_;
+	if ((media_type & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) {
+#line 5048 "FacebookPublishing.c"
+		const gchar* _tmp49_;
+		gchar* _tmp50_;
 #line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp60_ = label_text;
+		_tmp49_ = 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);
+		_tmp50_ = g_strconcat (_tmp49_, 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 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		label_text = _tmp61_;
-#line 4767 "FacebookPublishing.c"
+		label_text = _tmp50_;
+#line 5059 "FacebookPublishing.c"
 	}
 #line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp62_ = self->priv->how_to_label;
+	_tmp51_ = self->priv->how_to_label;
 #line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp63_ = label_text;
+	_tmp52_ = label_text;
 #line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	gtk_label_set_label (_tmp62_, _tmp63_);
+	gtk_label_set_label (_tmp51_, _tmp52_);
 #line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp64_ = self->priv->strip_metadata_check;
+	_tmp53_ = 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_);
+	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_toggle_button_get_type (), GtkToggleButton), strip_metadata);
 #line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_setup_visibility_combo (self);
 #line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp66_ = self->priv->visibility_combo;
+	_tmp54_ = 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);
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_combo_box_get_type (), GtkComboBox), 0);
 #line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp67_ = self->priv->publish_button;
+	_tmp55_ = 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);
+	g_signal_connect_object (_tmp55_, "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;
+	_tmp56_ = 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);
+	g_signal_connect_object (_tmp56_, "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 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_);
+	_tmp57_ = self->priv->resolution_combo;
 #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_);
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_combo_box_get_type (), GtkComboBox), publishing_facebook_facebook_publisher_get_persistent_default_size (publisher));
 #line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp72_ = self->priv->resolution_combo;
+	_tmp58_ = 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);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, 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;
+	_tmp61_ = self->priv->create_new_radio;
 #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp75_ != NULL) {
-#line 4813 "FacebookPublishing.c"
-		GtkRadioButton* _tmp76_;
-		gboolean _tmp77_;
-		gboolean _tmp78_;
+	if (_tmp61_ != NULL) {
+#line 5099 "FacebookPublishing.c"
+		GtkRadioButton* _tmp62_;
+		gboolean _tmp63_;
+		gboolean _tmp64_;
 #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp76_ = self->priv->create_new_radio;
+		_tmp62_ = 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));
+		_tmp63_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_toggle_button_get_type (), GtkToggleButton));
 #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp78_ = _tmp77_;
+		_tmp64_ = _tmp63_;
 #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp74_ = _tmp78_;
-#line 4825 "FacebookPublishing.c"
+		_tmp60_ = _tmp64_;
+#line 5111 "FacebookPublishing.c"
 	} else {
 #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp74_ = FALSE;
-#line 4829 "FacebookPublishing.c"
+		_tmp60_ = FALSE;
+#line 5115 "FacebookPublishing.c"
 	}
 #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp74_) {
+	if (_tmp60_) {
 #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp73_ = TRUE;
-#line 4835 "FacebookPublishing.c"
+		_tmp59_ = TRUE;
+#line 5121 "FacebookPublishing.c"
 	} else {
-		SpitPublishingPublisherMediaType _tmp79_;
 #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 4842 "FacebookPublishing.c"
+		_tmp59_ = (media_type & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) != 0;
+#line 5125 "FacebookPublishing.c"
 	}
 #line 799 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp80_ = self->priv->visibility_combo;
+	_tmp65_ = 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;
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_widget_get_type (), GtkWidget), _tmp59_);
 #line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp81_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 4852 "FacebookPublishing.c"
-		GtkCheckButton* _tmp82_;
-		GtkCheckButton* _tmp83_;
-		GtkComboBoxText* _tmp84_;
-		GtkRadioButton* _tmp85_;
-		GtkRadioButton* _tmp86_;
-		GtkComboBoxText* _tmp87_;
-		GtkEntry* _tmp88_;
+	if (media_type == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+#line 5133 "FacebookPublishing.c"
+		GtkCheckButton* _tmp66_;
+		GtkCheckButton* _tmp67_;
+		GtkComboBoxText* _tmp68_;
+		GtkRadioButton* _tmp69_;
+		GtkRadioButton* _tmp70_;
+		GtkComboBoxText* _tmp71_;
+		GtkEntry* _tmp72_;
 #line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp82_ = self->priv->strip_metadata_check;
+		_tmp66_ = 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);
+		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_toggle_button_get_type (), GtkToggleButton), FALSE);
 #line 806 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp83_ = self->priv->strip_metadata_check;
+		_tmp67_ = 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);
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp84_ = self->priv->resolution_combo;
+		_tmp68_ = 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);
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp85_ = self->priv->use_existing_radio;
+		_tmp69_ = 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);
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp86_ = self->priv->create_new_radio;
+		_tmp70_ = 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);
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp87_ = self->priv->existing_albums_combo;
+		_tmp71_ = 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);
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp88_ = self->priv->new_album_entry;
+		_tmp72_ = 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 4888 "FacebookPublishing.c"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 5169 "FacebookPublishing.c"
 	}
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (label_text);
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 4894 "FacebookPublishing.c"
+#line 5175 "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) {
+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 4901 "FacebookPublishing.c"
+#line 5191 "FacebookPublishing.c"
 }
 
 
-static gboolean publishing_facebook_publishing_options_pane_publishing_photos (PublishingFacebookPublishingOptionsPane* self) {
+static gboolean
+publishing_facebook_publishing_options_pane_publishing_photos (PublishingFacebookPublishingOptionsPane* self)
+{
 	gboolean result = FALSE;
 	SpitPublishingPublisherMediaType _tmp0_;
 #line 815 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -4932,18 +5224,22 @@ static gboolean publishing_facebook_publishing_options_pane_publishing_photos (P
 	result = (_tmp0_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0;
 #line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 4916 "FacebookPublishing.c"
+#line 5208 "FacebookPublishing.c"
 }
 
 
-static gpointer _publishing_facebook_publishing_options_pane_privacy_description_ref0 (gpointer self) {
+static gpointer
+_publishing_facebook_publishing_options_pane_privacy_description_ref0 (gpointer self)
+{
 #line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? publishing_facebook_publishing_options_pane_privacy_description_ref (self) : NULL;
-#line 4923 "FacebookPublishing.c"
+#line 5217 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_publishing_options_pane_setup_visibility_combo (PublishingFacebookPublishingOptionsPane* self) {
+static void
+publishing_facebook_publishing_options_pane_setup_visibility_combo (PublishingFacebookPublishingOptionsPane* self)
+{
 	PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp0_;
 	gint _tmp0__length1;
 #line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -4952,7 +5248,7 @@ static void publishing_facebook_publishing_options_pane_setup_visibility_combo (
 	_tmp0_ = self->priv->privacy_descriptions;
 #line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0__length1 = self->priv->privacy_descriptions_length1;
-#line 4936 "FacebookPublishing.c"
+#line 5232 "FacebookPublishing.c"
 	{
 		PublishingFacebookPublishingOptionsPanePrivacyDescription** p_collection = NULL;
 		gint p_collection_length1 = 0;
@@ -4964,14 +5260,14 @@ static void publishing_facebook_publishing_options_pane_setup_visibility_combo (
 		p_collection_length1 = _tmp0__length1;
 #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 4948 "FacebookPublishing.c"
+#line 5244 "FacebookPublishing.c"
 			PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp1_;
 			PublishingFacebookPublishingOptionsPanePrivacyDescription* p = NULL;
 #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 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			p = _tmp1_;
-#line 4955 "FacebookPublishing.c"
+#line 5251 "FacebookPublishing.c"
 			{
 				GtkComboBoxText* _tmp2_;
 				PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp3_;
@@ -4986,14 +5282,16 @@ static void publishing_facebook_publishing_options_pane_setup_visibility_combo (
 				gtk_combo_box_text_append_text (_tmp2_, _tmp4_);
 #line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_publishing_facebook_publishing_options_pane_privacy_description_unref0 (p);
-#line 4970 "FacebookPublishing.c"
+#line 5266 "FacebookPublishing.c"
 			}
 		}
 	}
 }
 
 
-static void publishing_facebook_publishing_options_pane_setup_resolution_combo (PublishingFacebookPublishingOptionsPane* self) {
+static void
+publishing_facebook_publishing_options_pane_setup_resolution_combo (PublishingFacebookPublishingOptionsPane* self)
+{
 	PublishingFacebookResolution* _tmp0_;
 	gint _tmp0__length1;
 #line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5002,7 +5300,7 @@ static void publishing_facebook_publishing_options_pane_setup_resolution_combo (
 	_tmp0_ = self->priv->possible_resolutions;
 #line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0__length1 = self->priv->possible_resolutions_length1;
-#line 4986 "FacebookPublishing.c"
+#line 5284 "FacebookPublishing.c"
 	{
 		PublishingFacebookResolution* res_collection = NULL;
 		gint res_collection_length1 = 0;
@@ -5014,11 +5312,11 @@ static void publishing_facebook_publishing_options_pane_setup_resolution_combo (
 		res_collection_length1 = _tmp0__length1;
 #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 4998 "FacebookPublishing.c"
+#line 5296 "FacebookPublishing.c"
 			PublishingFacebookResolution res = 0;
 #line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			res = res_collection[res_it];
-#line 5002 "FacebookPublishing.c"
+#line 5300 "FacebookPublishing.c"
 			{
 				GtkComboBoxText* _tmp1_;
 				PublishingFacebookResolution _tmp2_;
@@ -5036,14 +5334,16 @@ static void publishing_facebook_publishing_options_pane_setup_resolution_combo (
 				gtk_combo_box_text_append_text (_tmp1_, _tmp4_);
 #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_g_free0 (_tmp4_);
-#line 5020 "FacebookPublishing.c"
+#line 5318 "FacebookPublishing.c"
 			}
 		}
 	}
 }
 
 
-static void publishing_facebook_publishing_options_pane_on_use_existing_toggled (PublishingFacebookPublishingOptionsPane* self) {
+static void
+publishing_facebook_publishing_options_pane_on_use_existing_toggled (PublishingFacebookPublishingOptionsPane* self)
+{
 	GtkRadioButton* _tmp0_;
 	gboolean _tmp1_;
 	gboolean _tmp2_;
@@ -5057,7 +5357,7 @@ static void publishing_facebook_publishing_options_pane_on_use_existing_toggled
 	_tmp2_ = _tmp1_;
 #line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp2_) {
-#line 5041 "FacebookPublishing.c"
+#line 5341 "FacebookPublishing.c"
 		GtkComboBoxText* _tmp3_;
 		GtkEntry* _tmp4_;
 		GtkComboBoxText* _tmp5_;
@@ -5081,12 +5381,14 @@ static void publishing_facebook_publishing_options_pane_on_use_existing_toggled
 		_tmp7_ = self->priv->existing_albums_combo;
 #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 5065 "FacebookPublishing.c"
+#line 5365 "FacebookPublishing.c"
 	}
 }
 
 
-static void publishing_facebook_publishing_options_pane_on_create_new_toggled (PublishingFacebookPublishingOptionsPane* self) {
+static void
+publishing_facebook_publishing_options_pane_on_create_new_toggled (PublishingFacebookPublishingOptionsPane* self)
+{
 	GtkRadioButton* _tmp0_;
 	gboolean _tmp1_;
 	gboolean _tmp2_;
@@ -5100,7 +5402,7 @@ static void publishing_facebook_publishing_options_pane_on_create_new_toggled (P
 	_tmp2_ = _tmp1_;
 #line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp2_) {
-#line 5084 "FacebookPublishing.c"
+#line 5386 "FacebookPublishing.c"
 		GtkComboBoxText* _tmp3_;
 		GtkEntry* _tmp4_;
 		GtkEntry* _tmp5_;
@@ -5121,15 +5423,16 @@ static void publishing_facebook_publishing_options_pane_on_create_new_toggled (P
 		_tmp6_ = self->priv->visibility_combo;
 #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 5105 "FacebookPublishing.c"
+#line 5407 "FacebookPublishing.c"
 	}
 }
 
 
-static void publishing_facebook_publishing_options_pane_on_size_changed (PublishingFacebookPublishingOptionsPane* self) {
+static void
+publishing_facebook_publishing_options_pane_on_size_changed (PublishingFacebookPublishingOptionsPane* self)
+{
 	PublishingFacebookFacebookPublisher* _tmp0_;
 	GtkComboBoxText* _tmp1_;
-	gint _tmp2_;
 #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5137,39 +5440,38 @@ static void publishing_facebook_publishing_options_pane_on_size_changed (Publish
 #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->resolution_combo;
 #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 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishing_facebook_facebook_publisher_set_persistent_default_size (_tmp0_, _tmp2_);
-#line 5124 "FacebookPublishing.c"
+	publishing_facebook_facebook_publisher_set_persistent_default_size (_tmp0_, gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)));
+#line 5425 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_publishing_options_pane_on_logout_button_clicked (PublishingFacebookPublishingOptionsPane* self) {
+static void
+publishing_facebook_publishing_options_pane_on_logout_button_clicked (PublishingFacebookPublishingOptionsPane* self)
+{
 #line 859 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_emit (self, publishing_facebook_publishing_options_pane_signals[PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
-#line 5133 "FacebookPublishing.c"
+#line 5436 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_publishing_options_pane_on_publish_button_clicked (PublishingFacebookPublishingOptionsPane* self) {
+static void
+publishing_facebook_publishing_options_pane_on_publish_button_clicked (PublishingFacebookPublishingOptionsPane* self)
+{
 	gchar* album_name = NULL;
 	gchar* privacy_setting = NULL;
 	PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp0_;
 	gint _tmp0__length1;
 	GtkComboBoxText* _tmp1_;
-	gint _tmp2_;
-	PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp3_;
-	const gchar* _tmp4_;
-	gchar* _tmp5_;
+	PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
 	PublishingFacebookResolution resolution_setting = 0;
-	gboolean _tmp6_;
-	const gchar* _tmp19_;
-	const gchar* _tmp20_;
-	PublishingFacebookResolution _tmp21_;
-	GtkCheckButton* _tmp22_;
-	gboolean _tmp23_;
+	const gchar* _tmp16_;
+	const gchar* _tmp17_;
+	PublishingFacebookResolution _tmp18_;
+	GtkCheckButton* _tmp19_;
 #line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5179,75 +5481,68 @@ static void publishing_facebook_publishing_options_pane_on_publish_button_clicke
 #line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->visibility_combo;
 #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));
+	_tmp2_ = _tmp0_[gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox))];
 #line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp3_ = _tmp0_[_tmp2_];
+	_tmp3_ = _tmp2_->privacy_setting;
 #line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp4_ = _tmp3_->privacy_setting;
+	_tmp4_ = g_strdup (_tmp3_);
 #line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = g_strdup (_tmp4_);
-#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	privacy_setting = _tmp5_;
-#line 869 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp6_ = publishing_facebook_publishing_options_pane_publishing_photos (self);
+	privacy_setting = _tmp4_;
 #line 869 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp6_) {
-#line 5176 "FacebookPublishing.c"
-		PublishingFacebookResolution* _tmp7_;
-		gint _tmp7__length1;
-		GtkComboBoxText* _tmp8_;
-		gint _tmp9_;
-		PublishingFacebookResolution _tmp10_;
-		GtkRadioButton* _tmp11_;
-		gboolean _tmp12_;
-		gboolean _tmp13_;
-#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp7_ = self->priv->possible_resolutions;
+	if (publishing_facebook_publishing_options_pane_publishing_photos (self)) {
+#line 5474 "FacebookPublishing.c"
+		PublishingFacebookResolution* _tmp5_;
+		gint _tmp5__length1;
+		GtkComboBoxText* _tmp6_;
+		PublishingFacebookResolution _tmp7_;
+		GtkRadioButton* _tmp8_;
+		gboolean _tmp9_;
+		gboolean _tmp10_;
 #line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp7__length1 = self->priv->possible_resolutions_length1;
+		_tmp5_ = self->priv->possible_resolutions;
 #line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp8_ = self->priv->resolution_combo;
+		_tmp5__length1 = self->priv->possible_resolutions_length1;
 #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));
+		_tmp6_ = self->priv->resolution_combo;
 #line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp10_ = _tmp7_[_tmp9_];
+		_tmp7_ = _tmp5_[gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox))];
 #line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		resolution_setting = _tmp10_;
+		resolution_setting = _tmp7_;
 #line 871 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp11_ = self->priv->use_existing_radio;
+		_tmp8_ = self->priv->use_existing_radio;
 #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));
+		_tmp9_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_toggle_button_get_type (), GtkToggleButton));
 #line 871 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp13_ = _tmp12_;
+		_tmp10_ = _tmp9_;
 #line 871 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		if (_tmp13_) {
-#line 5205 "FacebookPublishing.c"
-			GtkComboBoxText* _tmp14_;
-			gchar* _tmp15_;
+		if (_tmp10_) {
+#line 5500 "FacebookPublishing.c"
+			GtkComboBoxText* _tmp11_;
+			gchar* _tmp12_;
 #line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp14_ = self->priv->existing_albums_combo;
+			_tmp11_ = self->priv->existing_albums_combo;
 #line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp15_ = gtk_combo_box_text_get_active_text (_tmp14_);
+			_tmp12_ = gtk_combo_box_text_get_active_text (_tmp11_);
 #line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_free0 (album_name);
 #line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			album_name = _tmp15_;
-#line 5216 "FacebookPublishing.c"
+			album_name = _tmp12_;
+#line 5511 "FacebookPublishing.c"
 		} else {
-			GtkEntry* _tmp16_;
-			const gchar* _tmp17_;
-			gchar* _tmp18_;
+			GtkEntry* _tmp13_;
+			const gchar* _tmp14_;
+			gchar* _tmp15_;
 #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp16_ = self->priv->new_album_entry;
+			_tmp13_ = self->priv->new_album_entry;
 #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp17_ = gtk_entry_get_text (_tmp16_);
+			_tmp14_ = gtk_entry_get_text (_tmp13_);
 #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp18_ = g_strdup (_tmp17_);
+			_tmp15_ = g_strdup (_tmp14_);
 #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_free0 (album_name);
 #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			album_name = _tmp18_;
-#line 5231 "FacebookPublishing.c"
+			album_name = _tmp15_;
+#line 5526 "FacebookPublishing.c"
 		}
 	} else {
 #line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5256,80 +5551,96 @@ static void publishing_facebook_publishing_options_pane_on_publish_button_clicke
 		_g_free0 (album_name);
 #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		album_name = NULL;
-#line 5240 "FacebookPublishing.c"
+#line 5535 "FacebookPublishing.c"
 	}
 #line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp19_ = album_name;
-#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp20_ = privacy_setting;
+	_tmp16_ = album_name;
 #line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp21_ = resolution_setting;
+	_tmp17_ = privacy_setting;
 #line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp22_ = self->priv->strip_metadata_check;
+	_tmp18_ = resolution_setting;
 #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));
+	_tmp19_ = self->priv->strip_metadata_check;
 #line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_emit (self, publishing_facebook_publishing_options_pane_signals[PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp19_, _tmp20_, _tmp21_, _tmp23_);
+	g_signal_emit (self, publishing_facebook_publishing_options_pane_signals[PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp16_, _tmp17_, _tmp18_, gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_toggle_button_get_type (), GtkToggleButton)));
 #line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (privacy_setting);
 #line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (album_name);
-#line 5258 "FacebookPublishing.c"
+#line 5551 "FacebookPublishing.c"
 }
 
 
-static void _vala_array_add7 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value) {
+static void
+_vala_array_add8 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array,
+                  int* length,
+                  int* size,
+                  PublishingFacebookPublishingOptionsPanePrivacyDescription* value)
+{
 #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if ((*length) == (*size)) {
 #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*array = g_renew (PublishingFacebookPublishingOptionsPanePrivacyDescription*, *array, (*size) + 1);
-#line 5269 "FacebookPublishing.c"
+#line 5567 "FacebookPublishing.c"
 	}
 #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[*length] = NULL;
-#line 5275 "FacebookPublishing.c"
+#line 5573 "FacebookPublishing.c"
 }
 
 
-static void _vala_array_add8 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value) {
+static void
+_vala_array_add9 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array,
+                  int* length,
+                  int* size,
+                  PublishingFacebookPublishingOptionsPanePrivacyDescription* value)
+{
 #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if ((*length) == (*size)) {
 #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*array = g_renew (PublishingFacebookPublishingOptionsPanePrivacyDescription*, *array, (*size) + 1);
-#line 5286 "FacebookPublishing.c"
+#line 5589 "FacebookPublishing.c"
 	}
 #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[*length] = NULL;
-#line 5292 "FacebookPublishing.c"
+#line 5595 "FacebookPublishing.c"
 }
 
 
-static void _vala_array_add9 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value) {
+static void
+_vala_array_add10 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array,
+                   int* length,
+                   int* size,
+                   PublishingFacebookPublishingOptionsPanePrivacyDescription* value)
+{
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if ((*length) == (*size)) {
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*array = g_renew (PublishingFacebookPublishingOptionsPanePrivacyDescription*, *array, (*size) + 1);
-#line 5303 "FacebookPublishing.c"
+#line 5611 "FacebookPublishing.c"
 	}
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[*length] = NULL;
-#line 5309 "FacebookPublishing.c"
+#line 5617 "FacebookPublishing.c"
 }
 
 
-static PublishingFacebookPublishingOptionsPanePrivacyDescription** publishing_facebook_publishing_options_pane_create_privacy_descriptions (PublishingFacebookPublishingOptionsPane* self, int* result_length1) {
+static PublishingFacebookPublishingOptionsPanePrivacyDescription**
+publishing_facebook_publishing_options_pane_create_privacy_descriptions (PublishingFacebookPublishingOptionsPane* self,
+                                                                         int* result_length1)
+{
 	PublishingFacebookPublishingOptionsPanePrivacyDescription** result = NULL;
 	PublishingFacebookPublishingOptionsPanePrivacyDescription** _result_ = NULL;
 	PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp0_;
@@ -5363,7 +5674,7 @@ static PublishingFacebookPublishingOptionsPanePrivacyDescription** publishing_fa
 #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = publishing_facebook_publishing_options_pane_privacy_description_new (_ ("Just me"), "{ 'value' : 'SELF' }");
 #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_vala_array_add7 (&_result_, &_result__length1, &__result__size_, _tmp2_);
+	_vala_array_add8 (&_result_, &_result__length1, &__result__size_, _tmp2_);
 #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = _result_;
 #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5371,7 +5682,7 @@ static PublishingFacebookPublishingOptionsPanePrivacyDescription** publishing_fa
 #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = publishing_facebook_publishing_options_pane_privacy_description_new (_ ("Friends"), "{ 'value' : 'ALL_FRIENDS' }");
 #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_vala_array_add8 (&_result_, &_result__length1, &__result__size_, _tmp4_);
+	_vala_array_add9 (&_result_, &_result__length1, &__result__size_, _tmp4_);
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = _result_;
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5379,7 +5690,7 @@ static PublishingFacebookPublishingOptionsPanePrivacyDescription** publishing_fa
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = publishing_facebook_publishing_options_pane_privacy_description_new (_ ("Everyone"), "{ 'value' : 'EVERYONE' }");
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_vala_array_add9 (&_result_, &_result__length1, &__result__size_, _tmp6_);
+	_vala_array_add10 (&_result_, &_result__length1, &__result__size_, _tmp6_);
 #line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = _result_;
 #line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5388,47 +5699,60 @@ static PublishingFacebookPublishingOptionsPanePrivacyDescription** publishing_fa
 	if (result_length1) {
 #line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*result_length1 = _tmp7__length1;
-#line 5372 "FacebookPublishing.c"
+#line 5683 "FacebookPublishing.c"
 	}
 #line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp7_;
 #line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 5378 "FacebookPublishing.c"
+#line 5689 "FacebookPublishing.c"
 }
 
 
-static void _vala_array_add10 (PublishingFacebookResolution* * array, int* length, int* size, PublishingFacebookResolution value) {
+static void
+_vala_array_add11 (PublishingFacebookResolution* * array,
+                   int* length,
+                   int* size,
+                   PublishingFacebookResolution value)
+{
 #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if ((*length) == (*size)) {
 #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*array = g_renew (PublishingFacebookResolution, *array, *size);
-#line 5389 "FacebookPublishing.c"
+#line 5705 "FacebookPublishing.c"
 	}
 #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 5393 "FacebookPublishing.c"
+#line 5709 "FacebookPublishing.c"
 }
 
 
-static void _vala_array_add11 (PublishingFacebookResolution* * array, int* length, int* size, PublishingFacebookResolution value) {
+static void
+_vala_array_add12 (PublishingFacebookResolution* * array,
+                   int* length,
+                   int* size,
+                   PublishingFacebookResolution value)
+{
 #line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if ((*length) == (*size)) {
 #line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*array = g_renew (PublishingFacebookResolution, *array, *size);
-#line 5404 "FacebookPublishing.c"
+#line 5725 "FacebookPublishing.c"
 	}
 #line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 5408 "FacebookPublishing.c"
+#line 5729 "FacebookPublishing.c"
 }
 
 
-static PublishingFacebookResolution* publishing_facebook_publishing_options_pane_create_resolution_list (PublishingFacebookPublishingOptionsPane* self, int* result_length1) {
+static PublishingFacebookResolution*
+publishing_facebook_publishing_options_pane_create_resolution_list (PublishingFacebookPublishingOptionsPane* self,
+                                                                    int* result_length1)
+{
 	PublishingFacebookResolution* result = NULL;
 	PublishingFacebookResolution* _result_ = NULL;
 	PublishingFacebookResolution* _tmp0_;
@@ -5455,13 +5779,13 @@ static PublishingFacebookResolution* publishing_facebook_publishing_options_pane
 #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1__length1 = _result__length1;
 #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_vala_array_add10 (&_result_, &_result__length1, &__result__size_, PUBLISHING_FACEBOOK_RESOLUTION_STANDARD);
+	_vala_array_add11 (&_result_, &_result__length1, &__result__size_, PUBLISHING_FACEBOOK_RESOLUTION_STANDARD);
 #line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = _result_;
 #line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2__length1 = _result__length1;
 #line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_vala_array_add11 (&_result_, &_result__length1, &__result__size_, PUBLISHING_FACEBOOK_RESOLUTION_HIGH);
+	_vala_array_add12 (&_result_, &_result__length1, &__result__size_, PUBLISHING_FACEBOOK_RESOLUTION_HIGH);
 #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = _result_;
 #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5470,222 +5794,218 @@ static PublishingFacebookResolution* publishing_facebook_publishing_options_pane
 	if (result_length1) {
 #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*result_length1 = _tmp3__length1;
-#line 5454 "FacebookPublishing.c"
+#line 5778 "FacebookPublishing.c"
 	}
 #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp3_;
 #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 5460 "FacebookPublishing.c"
+#line 5784 "FacebookPublishing.c"
 }
 
 
-void publishing_facebook_publishing_options_pane_installed (PublishingFacebookPublishingOptionsPane* self) {
-	gboolean _tmp0_;
-	GtkButton* _tmp24_;
+void
+publishing_facebook_publishing_options_pane_installed (PublishingFacebookPublishingOptionsPane* self)
+{
+	GtkButton* _tmp23_;
 #line 903 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = publishing_facebook_publishing_options_pane_publishing_photos (self);
-#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp0_) {
-#line 5473 "FacebookPublishing.c"
-		PublishingFacebookAlbum** _tmp1_;
-		gint _tmp1__length1;
+	if (publishing_facebook_publishing_options_pane_publishing_photos (self)) {
+#line 5796 "FacebookPublishing.c"
+		PublishingFacebookAlbum** _tmp0_;
+		gint _tmp0__length1;
 #line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp1_ = self->priv->albums;
+		_tmp0_ = self->priv->albums;
 #line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp1__length1 = self->priv->albums_length1;
+		_tmp0__length1 = self->priv->albums_length1;
 #line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		if (_tmp1__length1 == 0) {
-#line 5482 "FacebookPublishing.c"
-			GtkRadioButton* _tmp2_;
-			GtkEntry* _tmp3_;
-			GtkComboBoxText* _tmp4_;
-			GtkRadioButton* _tmp5_;
+		if (_tmp0__length1 == 0) {
+#line 5805 "FacebookPublishing.c"
+			GtkRadioButton* _tmp1_;
+			GtkEntry* _tmp2_;
+			GtkComboBoxText* _tmp3_;
+			GtkRadioButton* _tmp4_;
 #line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp2_ = self->priv->create_new_radio;
+			_tmp1_ = self->priv->create_new_radio;
 #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);
+			gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
 #line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp3_ = self->priv->new_album_entry;
+			_tmp2_ = self->priv->new_album_entry;
 #line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			gtk_entry_set_text (_tmp3_, PUBLISHING_FACEBOOK_DEFAULT_ALBUM_NAME);
+			gtk_entry_set_text (_tmp2_, PUBLISHING_FACEBOOK_DEFAULT_ALBUM_NAME);
 #line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp4_ = self->priv->existing_albums_combo;
+			_tmp3_ = self->priv->existing_albums_combo;
 #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);
+			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp5_ = self->priv->use_existing_radio;
+			_tmp4_ = self->priv->use_existing_radio;
 #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 5503 "FacebookPublishing.c"
+			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 5826 "FacebookPublishing.c"
 		} else {
 			gint default_album_seq_num = 0;
 			gint ticker = 0;
-			PublishingFacebookAlbum** _tmp6_;
-			gint _tmp6__length1;
-			gint _tmp15_;
+			PublishingFacebookAlbum** _tmp5_;
+			gint _tmp5__length1;
+			gint _tmp14_;
 #line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			default_album_seq_num = -1;
 #line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			ticker = 0;
 #line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp6_ = self->priv->albums;
+			_tmp5_ = self->priv->albums;
 #line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp6__length1 = self->priv->albums_length1;
-#line 5518 "FacebookPublishing.c"
+			_tmp5__length1 = self->priv->albums_length1;
+#line 5841 "FacebookPublishing.c"
 			{
 				PublishingFacebookAlbum** album_collection = NULL;
 				gint album_collection_length1 = 0;
 				gint _album_collection_size_ = 0;
 				gint album_it = 0;
 #line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				album_collection = _tmp6_;
+				album_collection = _tmp5_;
 #line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				album_collection_length1 = _tmp6__length1;
+				album_collection_length1 = _tmp5__length1;
 #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 5530 "FacebookPublishing.c"
-					PublishingFacebookAlbum* _tmp7_;
+				for (album_it = 0; album_it < _tmp5__length1; album_it = album_it + 1) {
+#line 5853 "FacebookPublishing.c"
+					PublishingFacebookAlbum* _tmp6_;
 					PublishingFacebookAlbum* album = NULL;
 #line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp7_ = _publishing_facebook_album_ref0 (album_collection[album_it]);
+					_tmp6_ = _publishing_facebook_album_ref0 (album_collection[album_it]);
 #line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					album = _tmp7_;
-#line 5537 "FacebookPublishing.c"
+					album = _tmp6_;
+#line 5860 "FacebookPublishing.c"
 					{
-						GtkComboBoxText* _tmp8_;
-						PublishingFacebookAlbum* _tmp9_;
-						const gchar* _tmp10_;
-						PublishingFacebookAlbum* _tmp11_;
-						const gchar* _tmp12_;
-						gint _tmp14_;
+						GtkComboBoxText* _tmp7_;
+						PublishingFacebookAlbum* _tmp8_;
+						const gchar* _tmp9_;
+						PublishingFacebookAlbum* _tmp10_;
+						const gchar* _tmp11_;
+						gint _tmp13_;
 #line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-						_tmp8_ = self->priv->existing_albums_combo;
+						_tmp7_ = self->priv->existing_albums_combo;
 #line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-						_tmp9_ = album;
+						_tmp8_ = album;
 #line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-						_tmp10_ = _tmp9_->name;
+						_tmp9_ = _tmp8_->name;
 #line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-						gtk_combo_box_text_append_text (_tmp8_, _tmp10_);
+						gtk_combo_box_text_append_text (_tmp7_, _tmp9_);
 #line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-						_tmp11_ = album;
+						_tmp10_ = album;
 #line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-						_tmp12_ = _tmp11_->name;
+						_tmp11_ = _tmp10_->name;
 #line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-						if (g_strcmp0 (_tmp12_, PUBLISHING_FACEBOOK_DEFAULT_ALBUM_NAME) == 0) {
-#line 5559 "FacebookPublishing.c"
-							gint _tmp13_;
+						if (g_strcmp0 (_tmp11_, PUBLISHING_FACEBOOK_DEFAULT_ALBUM_NAME) == 0) {
+#line 5882 "FacebookPublishing.c"
+							gint _tmp12_;
 #line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-							_tmp13_ = ticker;
+							_tmp12_ = ticker;
 #line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-							default_album_seq_num = _tmp13_;
-#line 5565 "FacebookPublishing.c"
+							default_album_seq_num = _tmp12_;
+#line 5888 "FacebookPublishing.c"
 						}
 #line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-						_tmp14_ = ticker;
+						_tmp13_ = ticker;
 #line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-						ticker = _tmp14_ + 1;
+						ticker = _tmp13_ + 1;
 #line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						_publishing_facebook_album_unref0 (album);
-#line 5573 "FacebookPublishing.c"
+#line 5896 "FacebookPublishing.c"
 					}
 				}
 			}
 #line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp15_ = default_album_seq_num;
+			_tmp14_ = default_album_seq_num;
 #line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			if (_tmp15_ != -1) {
-#line 5581 "FacebookPublishing.c"
-				GtkComboBoxText* _tmp16_;
-				gint _tmp17_;
-				GtkRadioButton* _tmp18_;
-				GtkEntry* _tmp19_;
+			if (_tmp14_ != -1) {
+#line 5904 "FacebookPublishing.c"
+				GtkComboBoxText* _tmp15_;
+				gint _tmp16_;
+				GtkRadioButton* _tmp17_;
+				GtkEntry* _tmp18_;
 #line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp16_ = self->priv->existing_albums_combo;
+				_tmp15_ = self->priv->existing_albums_combo;
 #line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp17_ = default_album_seq_num;
+				_tmp16_ = default_album_seq_num;
 #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_);
+				gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_combo_box_get_type (), GtkComboBox), _tmp16_);
 #line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp18_ = self->priv->use_existing_radio;
+				_tmp17_ = self->priv->use_existing_radio;
 #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);
+				gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
 #line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp19_ = self->priv->new_album_entry;
+				_tmp18_ = self->priv->new_album_entry;
 #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 5600 "FacebookPublishing.c"
+				gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 5923 "FacebookPublishing.c"
 			} else {
-				GtkRadioButton* _tmp20_;
+				GtkRadioButton* _tmp19_;
+				GtkComboBoxText* _tmp20_;
 				GtkComboBoxText* _tmp21_;
-				GtkComboBoxText* _tmp22_;
-				GtkEntry* _tmp23_;
+				GtkEntry* _tmp22_;
 #line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp20_ = self->priv->create_new_radio;
+				_tmp19_ = self->priv->create_new_radio;
 #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);
+				gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
 #line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp21_ = self->priv->existing_albums_combo;
+				_tmp20_ = self->priv->existing_albums_combo;
 #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);
+				gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_combo_box_get_type (), GtkComboBox), 0);
 #line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp22_ = self->priv->existing_albums_combo;
+				_tmp21_ = self->priv->existing_albums_combo;
 #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);
+				gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp23_ = self->priv->new_album_entry;
+				_tmp22_ = self->priv->new_album_entry;
 #line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				gtk_entry_set_text (_tmp23_, PUBLISHING_FACEBOOK_DEFAULT_ALBUM_NAME);
-#line 5622 "FacebookPublishing.c"
+				gtk_entry_set_text (_tmp22_, PUBLISHING_FACEBOOK_DEFAULT_ALBUM_NAME);
+#line 5945 "FacebookPublishing.c"
 			}
 		}
 	}
 #line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp24_ = self->priv->publish_button;
+	_tmp23_ = self->priv->publish_button;
 #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 5630 "FacebookPublishing.c"
+	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget));
+#line 5953 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_publishing_options_pane_notify_logout (PublishingFacebookPublishingOptionsPane* self) {
+static void
+publishing_facebook_publishing_options_pane_notify_logout (PublishingFacebookPublishingOptionsPane* self)
+{
 #line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_emit (self, publishing_facebook_publishing_options_pane_signals[PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
-#line 5639 "FacebookPublishing.c"
+#line 5964 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_publishing_options_pane_notify_publish (PublishingFacebookPublishingOptionsPane* self, const gchar* target_album, const gchar* privacy_setting, PublishingFacebookResolution target_resolution) {
-	const gchar* _tmp0_;
-	const gchar* _tmp1_;
-	PublishingFacebookResolution _tmp2_;
-	GtkCheckButton* _tmp3_;
-	gboolean _tmp4_;
+static void
+publishing_facebook_publishing_options_pane_notify_publish (PublishingFacebookPublishingOptionsPane* self,
+                                                            const gchar* target_album,
+                                                            const gchar* privacy_setting,
+                                                            PublishingFacebookResolution target_resolution)
+{
+	GtkCheckButton* _tmp0_;
 #line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (privacy_setting != NULL);
 #line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = target_album;
+	_tmp0_ = self->priv->strip_metadata_check;
 #line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = privacy_setting;
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = target_resolution;
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp3_ = self->priv->strip_metadata_check;
-#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 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_emit (self, publishing_facebook_publishing_options_pane_signals[PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp0_, _tmp1_, _tmp2_, _tmp4_);
-#line 5665 "FacebookPublishing.c"
+	g_signal_emit (self, publishing_facebook_publishing_options_pane_signals[PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, target_album, privacy_setting, target_resolution, gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton)));
+#line 5983 "FacebookPublishing.c"
 }
 
 
-static GtkWidget* publishing_facebook_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base) {
+static GtkWidget*
+publishing_facebook_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base)
+{
 	PublishingFacebookPublishingOptionsPane * self;
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_;
@@ -5700,11 +6020,13 @@ static GtkWidget* publishing_facebook_publishing_options_pane_real_get_widget (S
 	result = _tmp1_;
 #line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 5684 "FacebookPublishing.c"
+#line 6004 "FacebookPublishing.c"
 }
 
 
-static SpitPublishingDialogPaneGeometryOptions publishing_facebook_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
+static SpitPublishingDialogPaneGeometryOptions
+publishing_facebook_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base)
+{
 	PublishingFacebookPublishingOptionsPane * self;
 	SpitPublishingDialogPaneGeometryOptions result = 0;
 #line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5713,25 +6035,37 @@ static SpitPublishingDialogPaneGeometryOptions publishing_facebook_publishing_op
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
 #line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 5697 "FacebookPublishing.c"
+#line 6019 "FacebookPublishing.c"
 }
 
 
-static void _publishing_facebook_publishing_options_pane_notify_logout_publishing_facebook_publishing_options_pane_logout (PublishingFacebookPublishingOptionsPane* _sender, gpointer self) {
+static void
+_publishing_facebook_publishing_options_pane_notify_logout_publishing_facebook_publishing_options_pane_logout (PublishingFacebookPublishingOptionsPane* _sender,
+                                                                                                               gpointer self)
+{
 #line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_notify_logout ((PublishingFacebookPublishingOptionsPane*) self);
-#line 5704 "FacebookPublishing.c"
+#line 6029 "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) {
+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 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 5711 "FacebookPublishing.c"
+#line 6043 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
+static void
+publishing_facebook_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base)
+{
 	PublishingFacebookPublishingOptionsPane * self;
 #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);
@@ -5741,11 +6075,13 @@ static void publishing_facebook_publishing_options_pane_real_on_pane_installed (
 	g_signal_connect_object (self, "publish", (GCallback) _publishing_facebook_publishing_options_pane_notify_publish_publishing_facebook_publishing_options_pane_publish, self, 0);
 #line 956 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_installed (self);
-#line 5725 "FacebookPublishing.c"
+#line 6059 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
+static void
+publishing_facebook_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base)
+{
 	PublishingFacebookPublishingOptionsPane * self;
 	guint _tmp0_;
 	guint _tmp1_;
@@ -5759,11 +6095,18 @@ static void publishing_facebook_publishing_options_pane_real_on_pane_uninstalled
 	g_signal_parse_name ("publish", PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE);
 #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 5743 "FacebookPublishing.c"
+#line 6079 "FacebookPublishing.c"
 }
 
 
-static void g_cclosure_user_marshal_VOID__STRING_STRING_ENUM_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+static void
+g_cclosure_user_marshal_VOID__STRING_STRING_ENUM_BOOLEAN (GClosure * closure,
+                                                          GValue * return_value,
+                                                          guint n_param_values,
+                                                          const GValue * param_values,
+                                                          gpointer invocation_hint,
+                                                          gpointer marshal_data)
+{
 	typedef void (*GMarshalFunc_VOID__STRING_STRING_ENUM_BOOLEAN) (gpointer data1, const char* arg_1, const char* arg_2, gint arg_3, gboolean arg_4, gpointer data2);
 	register GMarshalFunc_VOID__STRING_STRING_ENUM_BOOLEAN callback;
 	register GCClosure * cc;
@@ -5778,28 +6121,30 @@ static void g_cclosure_user_marshal_VOID__STRING_STRING_ENUM_BOOLEAN (GClosure *
 		data1 = closure->data;
 #line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 5762 "FacebookPublishing.c"
+#line 6105 "FacebookPublishing.c"
 	} else {
 #line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		data2 = closure->data;
-#line 5768 "FacebookPublishing.c"
+#line 6111 "FacebookPublishing.c"
 	}
 #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 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 5774 "FacebookPublishing.c"
+#line 6117 "FacebookPublishing.c"
 }
 
 
-static PublishingFacebookPublishingOptionsPanePrivacyDescription* publishing_facebook_publishing_options_pane_privacy_description_construct (GType object_type, const gchar* description, const gchar* privacy_setting) {
+static PublishingFacebookPublishingOptionsPanePrivacyDescription*
+publishing_facebook_publishing_options_pane_privacy_description_construct (GType object_type,
+                                                                           const gchar* description,
+                                                                           const gchar* privacy_setting)
+{
 	PublishingFacebookPublishingOptionsPanePrivacyDescription* self = NULL;
-	const gchar* _tmp0_;
+	gchar* _tmp0_;
 	gchar* _tmp1_;
-	const gchar* _tmp2_;
-	gchar* _tmp3_;
 #line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (description != NULL, NULL);
 #line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5807,132 +6152,156 @@ static PublishingFacebookPublishingOptionsPanePrivacyDescription* publishing_fac
 #line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = (PublishingFacebookPublishingOptionsPanePrivacyDescription*) g_type_create_instance (object_type);
 #line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = description;
-#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (description);
 #line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->description);
 #line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->description = _tmp1_;
-#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = privacy_setting;
+	self->description = _tmp0_;
 #line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp3_ = g_strdup (_tmp2_);
+	_tmp1_ = g_strdup (privacy_setting);
 #line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->privacy_setting);
 #line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->privacy_setting = _tmp3_;
+	self->privacy_setting = _tmp1_;
 #line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 5808 "FacebookPublishing.c"
+#line 6149 "FacebookPublishing.c"
 }
 
 
-static PublishingFacebookPublishingOptionsPanePrivacyDescription* publishing_facebook_publishing_options_pane_privacy_description_new (const gchar* description, const gchar* privacy_setting) {
+static PublishingFacebookPublishingOptionsPanePrivacyDescription*
+publishing_facebook_publishing_options_pane_privacy_description_new (const gchar* description,
+                                                                     const gchar* privacy_setting)
+{
 #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 5815 "FacebookPublishing.c"
+#line 6159 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_publishing_options_pane_value_privacy_description_init (GValue* value) {
+static void
+publishing_facebook_publishing_options_pane_value_privacy_description_init (GValue* value)
+{
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 5822 "FacebookPublishing.c"
+#line 6168 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_publishing_options_pane_value_privacy_description_free_value (GValue* value) {
+static void
+publishing_facebook_publishing_options_pane_value_privacy_description_free_value (GValue* value)
+{
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (value->data[0].v_pointer) {
 #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 5831 "FacebookPublishing.c"
+#line 6179 "FacebookPublishing.c"
 	}
 }
 
 
-static void publishing_facebook_publishing_options_pane_value_privacy_description_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_facebook_publishing_options_pane_value_privacy_description_copy_value (const GValue* src_value,
+                                                                                  GValue* dest_value)
+{
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (src_value->data[0].v_pointer) {
 #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 5841 "FacebookPublishing.c"
+#line 6192 "FacebookPublishing.c"
 	} else {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 5845 "FacebookPublishing.c"
+#line 6196 "FacebookPublishing.c"
 	}
 }
 
 
-static gpointer publishing_facebook_publishing_options_pane_value_privacy_description_peek_pointer (const GValue* value) {
+static gpointer
+publishing_facebook_publishing_options_pane_value_privacy_description_peek_pointer (const GValue* value)
+{
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 5853 "FacebookPublishing.c"
+#line 6206 "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) {
+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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 5860 "FacebookPublishing.c"
+#line 6218 "FacebookPublishing.c"
 		PublishingFacebookPublishingOptionsPanePrivacyDescription * object;
 		object = collect_values[0].v_pointer;
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #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 5867 "FacebookPublishing.c"
+#line 6225 "FacebookPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #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 5871 "FacebookPublishing.c"
+#line 6229 "FacebookPublishing.c"
 		}
 #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 5875 "FacebookPublishing.c"
+#line 6233 "FacebookPublishing.c"
 	} else {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 5879 "FacebookPublishing.c"
+#line 6237 "FacebookPublishing.c"
 	}
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 5883 "FacebookPublishing.c"
+#line 6241 "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) {
+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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!object_p) {
 #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 5894 "FacebookPublishing.c"
+#line 6257 "FacebookPublishing.c"
 	}
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = NULL;
-#line 5900 "FacebookPublishing.c"
+#line 6263 "FacebookPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 5904 "FacebookPublishing.c"
+#line 6267 "FacebookPublishing.c"
 	} else {
 #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 5908 "FacebookPublishing.c"
+#line 6271 "FacebookPublishing.c"
 	}
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 5912 "FacebookPublishing.c"
+#line 6275 "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) {
+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 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);
@@ -5942,20 +6311,25 @@ static GParamSpec* publishing_facebook_publishing_options_pane_param_spec_privac
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 5926 "FacebookPublishing.c"
+#line 6295 "FacebookPublishing.c"
 }
 
 
-static gpointer publishing_facebook_publishing_options_pane_value_get_privacy_description (const GValue* value) {
+static gpointer
+publishing_facebook_publishing_options_pane_value_get_privacy_description (const GValue* value)
+{
 #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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 5935 "FacebookPublishing.c"
+#line 6306 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_publishing_options_pane_value_set_privacy_description (GValue* value, gpointer v_object) {
+static void
+publishing_facebook_publishing_options_pane_value_set_privacy_description (GValue* value,
+                                                                           gpointer v_object)
+{
 	PublishingFacebookPublishingOptionsPanePrivacyDescription * old;
 #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));
@@ -5971,22 +6345,25 @@ static void publishing_facebook_publishing_options_pane_value_set_privacy_descri
 		value->data[0].v_pointer = v_object;
 #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 5955 "FacebookPublishing.c"
+#line 6329 "FacebookPublishing.c"
 	} else {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 5959 "FacebookPublishing.c"
+#line 6333 "FacebookPublishing.c"
 	}
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_options_pane_privacy_description_unref (old);
-#line 5965 "FacebookPublishing.c"
+#line 6339 "FacebookPublishing.c"
 	}
 }
 
 
-static void publishing_facebook_publishing_options_pane_value_take_privacy_description (GValue* value, gpointer v_object) {
+static void
+publishing_facebook_publishing_options_pane_value_take_privacy_description (GValue* value,
+                                                                            gpointer v_object)
+{
 	PublishingFacebookPublishingOptionsPanePrivacyDescription * old;
 #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));
@@ -6000,38 +6377,44 @@ static void publishing_facebook_publishing_options_pane_value_take_privacy_descr
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 5984 "FacebookPublishing.c"
+#line 6361 "FacebookPublishing.c"
 	} else {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 5988 "FacebookPublishing.c"
+#line 6365 "FacebookPublishing.c"
 	}
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_options_pane_privacy_description_unref (old);
-#line 5994 "FacebookPublishing.c"
+#line 6371 "FacebookPublishing.c"
 	}
 }
 
 
-static void publishing_facebook_publishing_options_pane_privacy_description_class_init (PublishingFacebookPublishingOptionsPanePrivacyDescriptionClass * klass) {
+static void
+publishing_facebook_publishing_options_pane_privacy_description_class_init (PublishingFacebookPublishingOptionsPanePrivacyDescriptionClass * klass)
+{
 #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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookPublishingOptionsPanePrivacyDescriptionClass *) klass)->finalize = publishing_facebook_publishing_options_pane_privacy_description_finalize;
-#line 6004 "FacebookPublishing.c"
+#line 6383 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_publishing_options_pane_privacy_description_instance_init (PublishingFacebookPublishingOptionsPanePrivacyDescription * self) {
+static void
+publishing_facebook_publishing_options_pane_privacy_description_instance_init (PublishingFacebookPublishingOptionsPanePrivacyDescription * self)
+{
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->ref_count = 1;
-#line 6011 "FacebookPublishing.c"
+#line 6392 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_publishing_options_pane_privacy_description_finalize (PublishingFacebookPublishingOptionsPanePrivacyDescription * obj) {
+static void
+publishing_facebook_publishing_options_pane_privacy_description_finalize (PublishingFacebookPublishingOptionsPanePrivacyDescription * obj)
+{
 	PublishingFacebookPublishingOptionsPanePrivacyDescription * self;
 #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);
@@ -6041,11 +6424,13 @@ static void publishing_facebook_publishing_options_pane_privacy_description_fina
 	_g_free0 (self->description);
 #line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->privacy_setting);
-#line 6025 "FacebookPublishing.c"
+#line 6408 "FacebookPublishing.c"
 }
 
 
-static GType publishing_facebook_publishing_options_pane_privacy_description_get_type (void) {
+static GType
+publishing_facebook_publishing_options_pane_privacy_description_get_type (void)
+{
 	static volatile gsize publishing_facebook_publishing_options_pane_privacy_description_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_facebook_publishing_options_pane_privacy_description_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { publishing_facebook_publishing_options_pane_value_privacy_description_init, publishing_facebook_publishing_options_pane_value_privacy_description_free_value, publishing_facebook_publishing_options_pane_value_privacy_description_copy_value, publishing_facebook_publishing_options_pane_value_privacy_description_peek_pointer, "p", publishing_facebook_publishing_options_pane_value_privacy_description_collect_value, "p", publishing_facebook_publishing_options_pane_value_privacy_description_lcopy_value };
@@ -6059,18 +6444,22 @@ static GType publishing_facebook_publishing_options_pane_privacy_description_get
 }
 
 
-static gpointer publishing_facebook_publishing_options_pane_privacy_description_ref (gpointer instance) {
+static gpointer
+publishing_facebook_publishing_options_pane_privacy_description_ref (gpointer instance)
+{
 	PublishingFacebookPublishingOptionsPanePrivacyDescription * self;
 	self = instance;
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return instance;
-#line 6050 "FacebookPublishing.c"
+#line 6437 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_publishing_options_pane_privacy_description_unref (gpointer instance) {
+static void
+publishing_facebook_publishing_options_pane_privacy_description_unref (gpointer instance)
+{
 	PublishingFacebookPublishingOptionsPanePrivacyDescription * self;
 	self = instance;
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -6079,12 +6468,14 @@ static void publishing_facebook_publishing_options_pane_privacy_description_unre
 		PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_PRIVACY_DESCRIPTION_GET_CLASS (self)->finalize (self);
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 6063 "FacebookPublishing.c"
+#line 6452 "FacebookPublishing.c"
 	}
 }
 
 
-static void publishing_facebook_publishing_options_pane_class_init (PublishingFacebookPublishingOptionsPaneClass * klass) {
+static void
+publishing_facebook_publishing_options_pane_class_init (PublishingFacebookPublishingOptionsPaneClass * klass)
+{
 #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 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -6095,11 +6486,13 @@ static void publishing_facebook_publishing_options_pane_class_init (PublishingFa
 	publishing_facebook_publishing_options_pane_signals[PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL] = 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 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_signals[PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL] = 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 6079 "FacebookPublishing.c"
+#line 6470 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
+static void
+publishing_facebook_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface)
+{
 #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 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -6110,11 +6503,13 @@ static void publishing_facebook_publishing_options_pane_spit_publishing_dialog_p
 	iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_facebook_publishing_options_pane_real_on_pane_installed;
 #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 6094 "FacebookPublishing.c"
+#line 6487 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_publishing_options_pane_instance_init (PublishingFacebookPublishingOptionsPane * self) {
+static void
+publishing_facebook_publishing_options_pane_instance_init (PublishingFacebookPublishingOptionsPane * self)
+{
 #line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv = PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
 #line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -6147,11 +6542,13 @@ static void publishing_facebook_publishing_options_pane_instance_init (Publishin
 	self->priv->publisher = NULL;
 #line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->resolution_combo = NULL;
-#line 6131 "FacebookPublishing.c"
+#line 6526 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_publishing_options_pane_finalize (GObject * obj) {
+static void
+publishing_facebook_publishing_options_pane_finalize (GObject * obj)
+{
 	PublishingFacebookPublishingOptionsPane * self;
 #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);
@@ -6189,11 +6586,13 @@ static void publishing_facebook_publishing_options_pane_finalize (GObject * obj)
 	_g_object_unref0 (self->priv->resolution_combo);
 #line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_OBJECT_CLASS (publishing_facebook_publishing_options_pane_parent_class)->finalize (obj);
-#line 6173 "FacebookPublishing.c"
+#line 6570 "FacebookPublishing.c"
 }
 
 
-GType publishing_facebook_publishing_options_pane_get_type (void) {
+GType
+publishing_facebook_publishing_options_pane_get_type (void)
+{
 	static volatile gsize publishing_facebook_publishing_options_pane_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_facebook_publishing_options_pane_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingFacebookPublishingOptionsPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_facebook_publishing_options_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFacebookPublishingOptionsPane), 0, (GInstanceInitFunc) publishing_facebook_publishing_options_pane_instance_init, NULL };
@@ -6207,13 +6606,15 @@ GType publishing_facebook_publishing_options_pane_get_type (void) {
 }
 
 
-gchar* publishing_facebook_endpoint_to_uri (PublishingFacebookEndpoint self) {
+gchar*
+publishing_facebook_endpoint_to_uri (PublishingFacebookEndpoint self)
+{
 	gchar* result = NULL;
 #line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	switch (self) {
 #line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case PUBLISHING_FACEBOOK_ENDPOINT_DEFAULT:
-#line 6197 "FacebookPublishing.c"
+#line 6598 "FacebookPublishing.c"
 		{
 			gchar* _tmp0_;
 #line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -6222,11 +6623,11 @@ gchar* publishing_facebook_endpoint_to_uri (PublishingFacebookEndpoint self) {
 			result = _tmp0_;
 #line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return result;
-#line 6206 "FacebookPublishing.c"
+#line 6607 "FacebookPublishing.c"
 		}
 #line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case PUBLISHING_FACEBOOK_ENDPOINT_VIDEO:
-#line 6210 "FacebookPublishing.c"
+#line 6611 "FacebookPublishing.c"
 		{
 			gchar* _tmp1_;
 #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -6235,11 +6636,11 @@ gchar* publishing_facebook_endpoint_to_uri (PublishingFacebookEndpoint self) {
 			result = _tmp1_;
 #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return result;
-#line 6219 "FacebookPublishing.c"
+#line 6620 "FacebookPublishing.c"
 		}
 #line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case PUBLISHING_FACEBOOK_ENDPOINT_TEST_CONNECTION:
-#line 6223 "FacebookPublishing.c"
+#line 6624 "FacebookPublishing.c"
 		{
 			gchar* _tmp2_;
 #line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -6248,19 +6649,21 @@ gchar* publishing_facebook_endpoint_to_uri (PublishingFacebookEndpoint self) {
 			result = _tmp2_;
 #line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return result;
-#line 6232 "FacebookPublishing.c"
+#line 6633 "FacebookPublishing.c"
 		}
 		default:
 		{
 #line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			g_assert_not_reached ();
-#line 6238 "FacebookPublishing.c"
+#line 6639 "FacebookPublishing.c"
 		}
 	}
 }
 
 
-GType publishing_facebook_endpoint_get_type (void) {
+GType
+publishing_facebook_endpoint_get_type (void)
+{
 	static volatile gsize publishing_facebook_endpoint_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_facebook_endpoint_type_id__volatile)) {
 		static const GEnumValue values[] = {{PUBLISHING_FACEBOOK_ENDPOINT_DEFAULT, "PUBLISHING_FACEBOOK_ENDPOINT_DEFAULT", "default"}, {PUBLISHING_FACEBOOK_ENDPOINT_VIDEO, "PUBLISHING_FACEBOOK_ENDPOINT_VIDEO", "video"}, {PUBLISHING_FACEBOOK_ENDPOINT_TEST_CONNECTION, "PUBLISHING_FACEBOOK_ENDPOINT_TEST_CONNECTION", "test-connection"}, {0, NULL, NULL}};
@@ -6272,53 +6675,70 @@ GType publishing_facebook_endpoint_get_type (void) {
 }
 
 
-static gchar* publishing_facebook_graph_message_real_get_uri (PublishingFacebookGraphMessage* self) {
+static gchar*
+publishing_facebook_graph_message_real_get_uri (PublishingFacebookGraphMessage* self)
+{
 #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 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 6261 "FacebookPublishing.c"
+#line 6666 "FacebookPublishing.c"
 }
 
 
-gchar* publishing_facebook_graph_message_get_uri (PublishingFacebookGraphMessage* self) {
+gchar*
+publishing_facebook_graph_message_get_uri (PublishingFacebookGraphMessage* self)
+{
 #line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (self), NULL);
 #line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return PUBLISHING_FACEBOOK_GRAPH_MESSAGE_GET_CLASS (self)->get_uri (self);
-#line 6270 "FacebookPublishing.c"
+#line 6677 "FacebookPublishing.c"
 }
 
 
-static gchar* publishing_facebook_graph_message_real_get_response_body (PublishingFacebookGraphMessage* self) {
+static gchar*
+publishing_facebook_graph_message_real_get_response_body (PublishingFacebookGraphMessage* self)
+{
 #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 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 6279 "FacebookPublishing.c"
+#line 6688 "FacebookPublishing.c"
 }
 
 
-gchar* publishing_facebook_graph_message_get_response_body (PublishingFacebookGraphMessage* self) {
+gchar*
+publishing_facebook_graph_message_get_response_body (PublishingFacebookGraphMessage* self)
+{
 #line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (self), NULL);
 #line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return PUBLISHING_FACEBOOK_GRAPH_MESSAGE_GET_CLASS (self)->get_response_body (self);
-#line 6288 "FacebookPublishing.c"
+#line 6699 "FacebookPublishing.c"
 }
 
 
-PublishingFacebookGraphMessage* publishing_facebook_graph_message_construct (GType object_type) {
+PublishingFacebookGraphMessage*
+publishing_facebook_graph_message_construct (GType object_type)
+{
 	PublishingFacebookGraphMessage* self = NULL;
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = (PublishingFacebookGraphMessage*) g_type_create_instance (object_type);
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 6298 "FacebookPublishing.c"
+#line 6711 "FacebookPublishing.c"
 }
 
 
-static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+static void
+g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure,
+                                       GValue * return_value,
+                                       guint n_param_values,
+                                       const GValue * param_values,
+                                       gpointer invocation_hint,
+                                       gpointer marshal_data)
+{
 	typedef void (*GMarshalFunc_VOID__INT_INT) (gpointer data1, gint arg_1, gint arg_2, gpointer data2);
 	register GMarshalFunc_VOID__INT_INT callback;
 	register GCClosure * cc;
@@ -6333,120 +6753,145 @@ static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, GValue *
 		data1 = closure->data;
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 6317 "FacebookPublishing.c"
+#line 6737 "FacebookPublishing.c"
 	} else {
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		data2 = closure->data;
-#line 6323 "FacebookPublishing.c"
+#line 6743 "FacebookPublishing.c"
 	}
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	callback = (GMarshalFunc_VOID__INT_INT) (marshal_data ? marshal_data : cc->callback);
 #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 6329 "FacebookPublishing.c"
+#line 6749 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_value_graph_message_init (GValue* value) {
+static void
+publishing_facebook_value_graph_message_init (GValue* value)
+{
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 6336 "FacebookPublishing.c"
+#line 6758 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_value_graph_message_free_value (GValue* value) {
+static void
+publishing_facebook_value_graph_message_free_value (GValue* value)
+{
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (value->data[0].v_pointer) {
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_message_unref (value->data[0].v_pointer);
-#line 6345 "FacebookPublishing.c"
+#line 6769 "FacebookPublishing.c"
 	}
 }
 
 
-static void publishing_facebook_value_graph_message_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_facebook_value_graph_message_copy_value (const GValue* src_value,
+                                                    GValue* dest_value)
+{
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (src_value->data[0].v_pointer) {
 #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 6355 "FacebookPublishing.c"
+#line 6782 "FacebookPublishing.c"
 	} else {
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 6359 "FacebookPublishing.c"
+#line 6786 "FacebookPublishing.c"
 	}
 }
 
 
-static gpointer publishing_facebook_value_graph_message_peek_pointer (const GValue* value) {
+static gpointer
+publishing_facebook_value_graph_message_peek_pointer (const GValue* value)
+{
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 6367 "FacebookPublishing.c"
+#line 6796 "FacebookPublishing.c"
 }
 
 
-static gchar* publishing_facebook_value_graph_message_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_facebook_value_graph_message_collect_value (GValue* value,
+                                                       guint n_collect_values,
+                                                       GTypeCValue* collect_values,
+                                                       guint collect_flags)
+{
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 6374 "FacebookPublishing.c"
+#line 6808 "FacebookPublishing.c"
 		PublishingFacebookGraphMessage * object;
 		object = collect_values[0].v_pointer;
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #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 6381 "FacebookPublishing.c"
+#line 6815 "FacebookPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #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 6385 "FacebookPublishing.c"
+#line 6819 "FacebookPublishing.c"
 		}
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = publishing_facebook_graph_message_ref (object);
-#line 6389 "FacebookPublishing.c"
+#line 6823 "FacebookPublishing.c"
 	} else {
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 6393 "FacebookPublishing.c"
+#line 6827 "FacebookPublishing.c"
 	}
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 6397 "FacebookPublishing.c"
+#line 6831 "FacebookPublishing.c"
 }
 
 
-static gchar* publishing_facebook_value_graph_message_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+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 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!object_p) {
 #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 6408 "FacebookPublishing.c"
+#line 6847 "FacebookPublishing.c"
 	}
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = NULL;
-#line 6414 "FacebookPublishing.c"
+#line 6853 "FacebookPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 6418 "FacebookPublishing.c"
+#line 6857 "FacebookPublishing.c"
 	} else {
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = publishing_facebook_graph_message_ref (value->data[0].v_pointer);
-#line 6422 "FacebookPublishing.c"
+#line 6861 "FacebookPublishing.c"
 	}
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 6426 "FacebookPublishing.c"
+#line 6865 "FacebookPublishing.c"
 }
 
 
-GParamSpec* publishing_facebook_param_spec_graph_message (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_facebook_param_spec_graph_message (const gchar* name,
+                                              const gchar* nick,
+                                              const gchar* blurb,
+                                              GType object_type,
+                                              GParamFlags flags)
+{
 	PublishingFacebookParamSpecGraphMessage* spec;
 #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);
@@ -6456,20 +6901,25 @@ GParamSpec* publishing_facebook_param_spec_graph_message (const gchar* name, con
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 6440 "FacebookPublishing.c"
+#line 6885 "FacebookPublishing.c"
 }
 
 
-gpointer publishing_facebook_value_get_graph_message (const GValue* value) {
+gpointer
+publishing_facebook_value_get_graph_message (const GValue* value)
+{
 #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 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 6449 "FacebookPublishing.c"
+#line 6896 "FacebookPublishing.c"
 }
 
 
-void publishing_facebook_value_set_graph_message (GValue* value, gpointer v_object) {
+void
+publishing_facebook_value_set_graph_message (GValue* value,
+                                             gpointer v_object)
+{
 	PublishingFacebookGraphMessage * old;
 #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));
@@ -6485,22 +6935,25 @@ void publishing_facebook_value_set_graph_message (GValue* value, gpointer v_obje
 		value->data[0].v_pointer = v_object;
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_message_ref (value->data[0].v_pointer);
-#line 6469 "FacebookPublishing.c"
+#line 6919 "FacebookPublishing.c"
 	} else {
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 6473 "FacebookPublishing.c"
+#line 6923 "FacebookPublishing.c"
 	}
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_message_unref (old);
-#line 6479 "FacebookPublishing.c"
+#line 6929 "FacebookPublishing.c"
 	}
 }
 
 
-void publishing_facebook_value_take_graph_message (GValue* value, gpointer v_object) {
+void
+publishing_facebook_value_take_graph_message (GValue* value,
+                                              gpointer v_object)
+{
 	PublishingFacebookGraphMessage * old;
 #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));
@@ -6514,22 +6967,24 @@ void publishing_facebook_value_take_graph_message (GValue* value, gpointer v_obj
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 6498 "FacebookPublishing.c"
+#line 6951 "FacebookPublishing.c"
 	} else {
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 6502 "FacebookPublishing.c"
+#line 6955 "FacebookPublishing.c"
 	}
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_message_unref (old);
-#line 6508 "FacebookPublishing.c"
+#line 6961 "FacebookPublishing.c"
 	}
 }
 
 
-static void publishing_facebook_graph_message_class_init (PublishingFacebookGraphMessageClass * klass) {
+static void
+publishing_facebook_graph_message_class_init (PublishingFacebookGraphMessageClass * klass)
+{
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_message_parent_class = g_type_class_peek_parent (klass);
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -6544,28 +6999,34 @@ static void publishing_facebook_graph_message_class_init (PublishingFacebookGrap
 	publishing_facebook_graph_message_signals[PUBLISHING_FACEBOOK_GRAPH_MESSAGE_FAILED_SIGNAL] = 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 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_message_signals[PUBLISHING_FACEBOOK_GRAPH_MESSAGE_DATA_TRANSMITTED_SIGNAL] = 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 6528 "FacebookPublishing.c"
+#line 6983 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_graph_message_instance_init (PublishingFacebookGraphMessage * self) {
+static void
+publishing_facebook_graph_message_instance_init (PublishingFacebookGraphMessage * self)
+{
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->ref_count = 1;
-#line 6535 "FacebookPublishing.c"
+#line 6992 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_graph_message_finalize (PublishingFacebookGraphMessage * obj) {
+static void
+publishing_facebook_graph_message_finalize (PublishingFacebookGraphMessage * obj)
+{
 	PublishingFacebookGraphMessage * self;
 #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 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 6545 "FacebookPublishing.c"
+#line 7004 "FacebookPublishing.c"
 }
 
 
-GType publishing_facebook_graph_message_get_type (void) {
+GType
+publishing_facebook_graph_message_get_type (void)
+{
 	static volatile gsize publishing_facebook_graph_message_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_facebook_graph_message_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { publishing_facebook_value_graph_message_init, publishing_facebook_value_graph_message_free_value, publishing_facebook_value_graph_message_copy_value, publishing_facebook_value_graph_message_peek_pointer, "p", publishing_facebook_value_graph_message_collect_value, "p", publishing_facebook_value_graph_message_lcopy_value };
@@ -6579,18 +7040,22 @@ GType publishing_facebook_graph_message_get_type (void) {
 }
 
 
-gpointer publishing_facebook_graph_message_ref (gpointer instance) {
+gpointer
+publishing_facebook_graph_message_ref (gpointer instance)
+{
 	PublishingFacebookGraphMessage * self;
 	self = instance;
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return instance;
-#line 6570 "FacebookPublishing.c"
+#line 7033 "FacebookPublishing.c"
 }
 
 
-void publishing_facebook_graph_message_unref (gpointer instance) {
+void
+publishing_facebook_graph_message_unref (gpointer instance)
+{
 	PublishingFacebookGraphMessage * self;
 	self = instance;
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -6599,19 +7064,25 @@ void publishing_facebook_graph_message_unref (gpointer instance) {
 		PUBLISHING_FACEBOOK_GRAPH_MESSAGE_GET_CLASS (self)->finalize (self);
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 6583 "FacebookPublishing.c"
+#line 7048 "FacebookPublishing.c"
 	}
 }
 
 
-static void _publishing_facebook_graph_session_on_request_unqueued_soup_session_request_unqueued (SoupSession* _sender, SoupMessage* msg, gpointer self) {
+static void
+_publishing_facebook_graph_session_on_request_unqueued_soup_session_request_unqueued (SoupSession* _sender,
+                                                                                      SoupMessage* msg,
+                                                                                      gpointer self)
+{
 #line 1172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_session_on_request_unqueued ((PublishingFacebookGraphSession*) self, msg);
-#line 6591 "FacebookPublishing.c"
+#line 7060 "FacebookPublishing.c"
 }
 
 
-PublishingFacebookGraphSession* publishing_facebook_graph_session_construct (GType object_type) {
+PublishingFacebookGraphSession*
+publishing_facebook_graph_session_construct (GType object_type)
+{
 	PublishingFacebookGraphSession* self = NULL;
 	SoupSession* _tmp0_;
 	SoupSession* _tmp1_;
@@ -6647,28 +7118,34 @@ PublishingFacebookGraphSession* publishing_facebook_graph_session_construct (GTy
 	g_object_set (_tmp3_, "ssl-use-system-ca-file", TRUE, NULL);
 #line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 6631 "FacebookPublishing.c"
+#line 7102 "FacebookPublishing.c"
 }
 
 
-PublishingFacebookGraphSession* publishing_facebook_graph_session_new (void) {
+PublishingFacebookGraphSession*
+publishing_facebook_graph_session_new (void)
+{
 #line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_graph_session_construct (PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION);
-#line 6638 "FacebookPublishing.c"
+#line 7111 "FacebookPublishing.c"
 }
 
 
-static gpointer _publishing_facebook_graph_message_ref0 (gpointer self) {
+static gpointer
+_publishing_facebook_graph_message_ref0 (gpointer self)
+{
 #line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? publishing_facebook_graph_message_ref (self) : NULL;
-#line 6645 "FacebookPublishing.c"
+#line 7120 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_graph_session_manage_message (PublishingFacebookGraphSession* self, PublishingFacebookGraphMessage* msg) {
+static void
+publishing_facebook_graph_session_manage_message (PublishingFacebookGraphSession* self,
+                                                  PublishingFacebookGraphMessage* msg)
+{
 	PublishingFacebookGraphMessage* _tmp0_;
 	PublishingFacebookGraphMessage* _tmp1_;
-	PublishingFacebookGraphMessage* _tmp2_;
 #line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self));
 #line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -6678,18 +7155,19 @@ static void publishing_facebook_graph_session_manage_message (PublishingFacebook
 #line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_assert (_tmp0_ == NULL, "current_message == null");
 #line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = msg;
-#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = _publishing_facebook_graph_message_ref0 (_tmp1_);
+	_tmp1_ = _publishing_facebook_graph_message_ref0 (msg);
 #line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (self->priv->current_message);
 #line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->current_message = _tmp2_;
-#line 6669 "FacebookPublishing.c"
+	self->priv->current_message = _tmp1_;
+#line 7144 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_graph_session_unmanage_message (PublishingFacebookGraphSession* self, PublishingFacebookGraphMessage* msg) {
+static void
+publishing_facebook_graph_session_unmanage_message (PublishingFacebookGraphSession* self,
+                                                    PublishingFacebookGraphMessage* msg)
+{
 	PublishingFacebookGraphMessage* _tmp0_;
 #line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self));
@@ -6703,40 +7181,43 @@ static void publishing_facebook_graph_session_unmanage_message (PublishingFacebo
 	_publishing_facebook_graph_message_unref0 (self->priv->current_message);
 #line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->current_message = NULL;
-#line 6687 "FacebookPublishing.c"
+#line 7165 "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) {
+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 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 6694 "FacebookPublishing.c"
+#line 7176 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_graph_session_on_request_unqueued (PublishingFacebookGraphSession* self, SoupMessage* msg) {
+static void
+publishing_facebook_graph_session_on_request_unqueued (PublishingFacebookGraphSession* self,
+                                                       SoupMessage* msg)
+{
 	PublishingFacebookGraphMessage* _tmp0_;
 	PublishingFacebookGraphSessionGraphMessageImpl* real_message = NULL;
 	PublishingFacebookGraphMessage* _tmp1_;
 	PublishingFacebookGraphSessionGraphMessageImpl* _tmp2_;
 	PublishingFacebookGraphSessionGraphMessageImpl* _tmp3_;
 	SoupMessage* _tmp4_;
-	SoupMessage* _tmp5_;
+	gboolean _tmp5_ = FALSE;
 	gboolean _tmp6_ = FALSE;
-	gboolean _tmp7_ = FALSE;
-	SoupMessage* _tmp8_;
-	guint _tmp9_;
-	guint _tmp10_;
-	PublishingFacebookGraphSessionGraphMessageImpl* _tmp21_;
-	SoupMessage* _tmp22_;
-	PublishingFacebookGraphSessionGraphMessageImpl* _tmp23_;
-	guint _tmp24_;
+	guint _tmp7_;
+	guint _tmp8_;
+	PublishingFacebookGraphSessionGraphMessageImpl* _tmp16_;
+	PublishingFacebookGraphSessionGraphMessageImpl* _tmp17_;
+	guint _tmp18_;
 	GError* _error_ = NULL;
-	SoupMessage* _tmp25_;
-	guint _tmp26_;
-	guint _tmp27_;
-	GError* _tmp68_;
-	GError* _tmp80_;
+	guint _tmp19_;
+	guint _tmp20_;
+	GError* _tmp54_;
+	GError* _tmp64_;
 #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self));
 #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -6756,422 +7237,380 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac
 #line 1190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = _tmp3_->soup_message;
 #line 1190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = msg;
-#line 1190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_vala_assert (_tmp4_ == _tmp5_, "real_message.soup_message == msg");
-#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp8_ = msg;
+	_vala_assert (_tmp4_ == msg, "real_message.soup_message == msg");
 #line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_object_get (_tmp8_, "status-code", &_tmp9_, NULL);
+	g_object_get (msg, "status-code", &_tmp7_, NULL);
 #line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp10_ = _tmp9_;
+	_tmp8_ = _tmp7_;
 #line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp10_ == ((guint) SOUP_STATUS_IO_ERROR)) {
+	if (_tmp8_ == ((guint) SOUP_STATUS_IO_ERROR)) {
 #line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp7_ = TRUE;
-#line 6753 "FacebookPublishing.c"
+		_tmp6_ = TRUE;
+#line 7230 "FacebookPublishing.c"
 	} else {
-		SoupMessage* _tmp11_;
-		guint _tmp12_;
-		guint _tmp13_;
+		guint _tmp9_;
+		guint _tmp10_;
 #line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp11_ = msg;
+		g_object_get (msg, "status-code", &_tmp9_, NULL);
 #line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		g_object_get (_tmp11_, "status-code", &_tmp12_, NULL);
+		_tmp10_ = _tmp9_;
 #line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp13_ = _tmp12_;
-#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp7_ = _tmp13_ == ((guint) SOUP_STATUS_MALFORMED);
-#line 6766 "FacebookPublishing.c"
+		_tmp6_ = _tmp10_ == ((guint) SOUP_STATUS_MALFORMED);
+#line 7240 "FacebookPublishing.c"
 	}
 #line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp7_) {
+	if (_tmp6_) {
 #line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp6_ = TRUE;
-#line 6772 "FacebookPublishing.c"
+		_tmp5_ = TRUE;
+#line 7246 "FacebookPublishing.c"
 	} else {
-		SoupMessage* _tmp14_;
-		guint _tmp15_;
-		guint _tmp16_;
-#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp14_ = msg;
+		guint _tmp11_;
+		guint _tmp12_;
 #line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		g_object_get (_tmp14_, "status-code", &_tmp15_, NULL);
+		g_object_get (msg, "status-code", &_tmp11_, NULL);
 #line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp16_ = _tmp15_;
+		_tmp12_ = _tmp11_;
 #line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp6_ = _tmp16_ == ((guint) SOUP_STATUS_TRY_AGAIN);
-#line 6785 "FacebookPublishing.c"
+		_tmp5_ = _tmp12_ == ((guint) SOUP_STATUS_TRY_AGAIN);
+#line 7256 "FacebookPublishing.c"
 	}
 #line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp6_) {
-#line 6789 "FacebookPublishing.c"
-		PublishingFacebookGraphSessionGraphMessageImpl* _tmp17_;
-		SoupSession* _tmp18_;
-		SoupMessage* _tmp19_;
-		SoupMessage* _tmp20_;
+	if (_tmp5_) {
+#line 7260 "FacebookPublishing.c"
+		PublishingFacebookGraphSessionGraphMessageImpl* _tmp13_;
+		SoupSession* _tmp14_;
+		SoupMessage* _tmp15_;
 #line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp17_ = real_message;
+		_tmp13_ = real_message;
 #line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp17_->bytes_so_far = 0;
-#line 1198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp18_ = self->priv->soup_session;
+		_tmp13_->bytes_so_far = 0;
 #line 1198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp19_ = msg;
+		_tmp14_ = self->priv->soup_session;
 #line 1198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp20_ = _g_object_ref0 (_tmp19_);
+		_tmp15_ = _g_object_ref0 (msg);
 #line 1198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		soup_session_queue_message (_tmp18_, _tmp20_, NULL, NULL);
+		soup_session_queue_message (_tmp14_, _tmp15_, NULL, NULL);
 #line 1199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_publishing_facebook_graph_message_unref0 (real_message);
 #line 1199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 6810 "FacebookPublishing.c"
+#line 7278 "FacebookPublishing.c"
 	}
 #line 1202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp21_ = real_message;
+	_tmp16_ = real_message;
 #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 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp22_ = msg;
+	publishing_facebook_graph_session_unmanage_message (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage));
 #line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp23_ = real_message;
+	_tmp17_ = real_message;
 #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);
+	g_signal_parse_name ("wrote-body-data", soup_message_get_type (), &_tmp18_, NULL, FALSE);
 #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_);
+	g_signal_handlers_disconnect_matched (msg, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp18_, 0, NULL, (GCallback) _publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data_soup_message_wrote_body_data, _tmp17_);
 #line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_error_ = NULL;
 #line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp25_ = msg;
+	g_object_get (msg, "status-code", &_tmp19_, NULL);
 #line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_object_get (_tmp25_, "status-code", &_tmp26_, NULL);
+	_tmp20_ = _tmp19_;
 #line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp27_ = _tmp26_;
-#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	switch (_tmp27_) {
+	switch (_tmp20_) {
 #line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case SOUP_STATUS_OK:
 #line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case SOUP_STATUS_CREATED:
-#line 6838 "FacebookPublishing.c"
+#line 7302 "FacebookPublishing.c"
 		{
 #line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			break;
-#line 6842 "FacebookPublishing.c"
+#line 7306 "FacebookPublishing.c"
 		}
 #line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case PUBLISHING_FACEBOOK_EXPIRED_SESSION_STATUS_CODE:
-#line 6846 "FacebookPublishing.c"
+#line 7310 "FacebookPublishing.c"
 		{
-			GError* _tmp28_;
+			GError* _tmp21_;
 #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.");
+			_tmp21_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_EXPIRED_SESSION, "OAuth Access Token has Expired. Logout user.");
 #line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_error_free0 (_error_);
 #line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_error_ = _tmp28_;
+			_error_ = _tmp21_;
 #line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			break;
-#line 6857 "FacebookPublishing.c"
+#line 7321 "FacebookPublishing.c"
 		}
 #line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case SOUP_STATUS_CANT_RESOLVE:
 #line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case SOUP_STATUS_CANT_RESOLVE_PROXY:
-#line 6863 "FacebookPublishing.c"
+#line 7327 "FacebookPublishing.c"
 		{
-			PublishingFacebookGraphSessionGraphMessageImpl* _tmp29_;
-			gchar* _tmp30_;
-			gchar* _tmp31_;
-			SoupMessage* _tmp32_;
-			guint _tmp33_;
-			guint _tmp34_;
-			GError* _tmp35_;
-#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp29_ = real_message;
+			PublishingFacebookGraphSessionGraphMessageImpl* _tmp22_;
+			gchar* _tmp23_;
+			gchar* _tmp24_;
+			guint _tmp25_;
+			guint _tmp26_;
+			GError* _tmp27_;
 #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));
+			_tmp22_ = real_message;
 #line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp31_ = _tmp30_;
+			_tmp23_ = publishing_facebook_graph_message_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage));
 #line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp32_ = msg;
+			_tmp24_ = _tmp23_;
 #line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			g_object_get (_tmp32_, "status-code", &_tmp33_, NULL);
+			g_object_get (msg, "status-code", &_tmp25_, NULL);
 #line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp34_ = _tmp33_;
+			_tmp26_ = _tmp25_;
 #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_);
+			_tmp27_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Unable to resolve %s (error code %u)", _tmp24_, _tmp26_);
 #line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_error_free0 (_error_);
 #line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_error_ = _tmp35_;
+			_error_ = _tmp27_;
 #line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_g_free0 (_tmp31_);
+			_g_free0 (_tmp24_);
 #line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			break;
-#line 6894 "FacebookPublishing.c"
+#line 7355 "FacebookPublishing.c"
 		}
 #line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case SOUP_STATUS_CANT_CONNECT:
 #line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case SOUP_STATUS_CANT_CONNECT_PROXY:
-#line 6900 "FacebookPublishing.c"
+#line 7361 "FacebookPublishing.c"
 		{
-			PublishingFacebookGraphSessionGraphMessageImpl* _tmp36_;
-			gchar* _tmp37_;
-			gchar* _tmp38_;
-			SoupMessage* _tmp39_;
-			guint _tmp40_;
-			guint _tmp41_;
-			GError* _tmp42_;
-#line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp36_ = real_message;
+			PublishingFacebookGraphSessionGraphMessageImpl* _tmp28_;
+			gchar* _tmp29_;
+			gchar* _tmp30_;
+			guint _tmp31_;
+			guint _tmp32_;
+			GError* _tmp33_;
 #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));
+			_tmp28_ = real_message;
 #line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp38_ = _tmp37_;
+			_tmp29_ = publishing_facebook_graph_message_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage));
 #line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp39_ = msg;
+			_tmp30_ = _tmp29_;
 #line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			g_object_get (_tmp39_, "status-code", &_tmp40_, NULL);
+			g_object_get (msg, "status-code", &_tmp31_, NULL);
 #line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp41_ = _tmp40_;
+			_tmp32_ = _tmp31_;
 #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_);
+			_tmp33_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Unable to connect to %s (error code %u)", _tmp30_, _tmp32_);
 #line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_error_free0 (_error_);
 #line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_error_ = _tmp42_;
+			_error_ = _tmp33_;
 #line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_g_free0 (_tmp38_);
+			_g_free0 (_tmp30_);
 #line 1228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			break;
-#line 6931 "FacebookPublishing.c"
+#line 7389 "FacebookPublishing.c"
 		}
 		default:
 		{
-			SoupMessage* _tmp43_;
-			guint _tmp44_;
-			guint _tmp45_;
-#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp43_ = msg;
+			guint _tmp34_;
+			guint _tmp35_;
 #line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			g_object_get (_tmp43_, "status-code", &_tmp44_, NULL);
+			g_object_get (msg, "status-code", &_tmp34_, NULL);
 #line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp45_ = _tmp44_;
+			_tmp35_ = _tmp34_;
 #line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			if (_tmp45_ >= ((guint) 100)) {
-#line 6946 "FacebookPublishing.c"
-				PublishingFacebookGraphSessionGraphMessageImpl* _tmp46_;
-				gchar* _tmp47_;
-				gchar* _tmp48_;
-				SoupMessage* _tmp49_;
-				guint _tmp50_;
-				guint _tmp51_;
-				SoupMessage* _tmp52_;
-				gchar* _tmp53_;
-				gchar* _tmp54_;
-				gchar* _tmp55_;
-				GError* _tmp56_;
-#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp46_ = real_message;
-#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));
+			if (_tmp35_ >= ((guint) 100)) {
+#line 7401 "FacebookPublishing.c"
+				PublishingFacebookGraphSessionGraphMessageImpl* _tmp36_;
+				gchar* _tmp37_;
+				gchar* _tmp38_;
+				guint _tmp39_;
+				guint _tmp40_;
+				gchar* _tmp41_;
+				gchar* _tmp42_;
+				gchar* _tmp43_;
+				GError* _tmp44_;
 #line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp48_ = _tmp47_;
+				_tmp36_ = real_message;
 #line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp49_ = msg;
+				_tmp37_ = publishing_facebook_graph_message_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage));
 #line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				g_object_get (_tmp49_, "status-code", &_tmp50_, NULL);
+				_tmp38_ = _tmp37_;
 #line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp51_ = _tmp50_;
+				g_object_get (msg, "status-code", &_tmp39_, NULL);
 #line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp52_ = msg;
+				_tmp40_ = _tmp39_;
 #line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				g_object_get (_tmp52_, "reason-phrase", &_tmp53_, NULL);
+				g_object_get (msg, "reason-phrase", &_tmp41_, NULL);
 #line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp54_ = _tmp53_;
+				_tmp42_ = _tmp41_;
 #line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp55_ = _tmp54_;
+				_tmp43_ = _tmp42_;
 #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_);
+				_tmp44_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Service %s returned HTTP status code %u %s", _tmp38_, _tmp40_, _tmp43_);
 #line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_g_error_free0 (_error_);
 #line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_error_ = _tmp56_;
+				_error_ = _tmp44_;
 #line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_g_free0 (_tmp55_);
+				_g_free0 (_tmp43_);
 #line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_g_free0 (_tmp48_);
-#line 6988 "FacebookPublishing.c"
+				_g_free0 (_tmp38_);
+#line 7437 "FacebookPublishing.c"
 			} else {
-				SoupMessage* _tmp57_;
-				gchar* _tmp58_;
-				gchar* _tmp59_;
-				gchar* _tmp60_;
-				PublishingFacebookGraphSessionGraphMessageImpl* _tmp61_;
-				gchar* _tmp62_;
-				gchar* _tmp63_;
-				SoupMessage* _tmp64_;
-				guint _tmp65_;
-				guint _tmp66_;
-				GError* _tmp67_;
-#line 1238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp57_ = msg;
+				gchar* _tmp45_;
+				gchar* _tmp46_;
+				gchar* _tmp47_;
+				PublishingFacebookGraphSessionGraphMessageImpl* _tmp48_;
+				gchar* _tmp49_;
+				gchar* _tmp50_;
+				guint _tmp51_;
+				guint _tmp52_;
+				GError* _tmp53_;
 #line 1238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				g_object_get (_tmp57_, "reason-phrase", &_tmp58_, NULL);
+				g_object_get (msg, "reason-phrase", &_tmp45_, NULL);
 #line 1238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp59_ = _tmp58_;
+				_tmp46_ = _tmp45_;
 #line 1238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp60_ = _tmp59_;
+				_tmp47_ = _tmp46_;
 #line 1238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				g_debug ("FacebookPublishing.vala:1238: %s", _tmp60_);
+				g_debug ("FacebookPublishing.vala:1238: %s", _tmp47_);
 #line 1238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_g_free0 (_tmp60_);
+				_g_free0 (_tmp47_);
 #line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp61_ = real_message;
+				_tmp48_ = real_message;
 #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));
+				_tmp49_ = publishing_facebook_graph_message_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage));
 #line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp63_ = _tmp62_;
+				_tmp50_ = _tmp49_;
 #line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp64_ = msg;
+				g_object_get (msg, "status-code", &_tmp51_, NULL);
 #line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				g_object_get (_tmp64_, "status-code", &_tmp65_, NULL);
+				_tmp52_ = _tmp51_;
 #line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp66_ = _tmp65_;
-#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_);
+				_tmp53_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Failure communicating with %s (error code %u)", _tmp50_, _tmp52_);
 #line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_g_error_free0 (_error_);
 #line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_error_ = _tmp67_;
+				_error_ = _tmp53_;
 #line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_g_free0 (_tmp63_);
-#line 7033 "FacebookPublishing.c"
+				_g_free0 (_tmp50_);
+#line 7476 "FacebookPublishing.c"
 			}
 #line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			break;
-#line 7037 "FacebookPublishing.c"
+#line 7480 "FacebookPublishing.c"
 		}
 	}
 #line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp68_ = _error_;
+	_tmp54_ = _error_;
 #line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp68_ == NULL) {
-#line 7044 "FacebookPublishing.c"
-		gboolean _tmp69_ = FALSE;
-		SoupMessage* _tmp70_;
-		SoupMessageBody* _tmp71_;
-		guint8* _tmp72_;
-		gint _tmp72__length1;
-#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp70_ = msg;
+	if (_tmp54_ == NULL) {
+#line 7487 "FacebookPublishing.c"
+		gboolean _tmp55_ = FALSE;
+		SoupMessageBody* _tmp56_;
+		guint8* _tmp57_;
+		gint _tmp57__length1;
 #line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp71_ = _tmp70_->response_body;
+		_tmp56_ = msg->response_body;
 #line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp72_ = _tmp71_->data;
+		_tmp57_ = _tmp56_->data;
 #line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp72__length1 = (gint) _tmp71_->length;
+		_tmp57__length1 = (gint) _tmp56_->length;
 #line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		if (_tmp72_ == NULL) {
+		if (_tmp57_ == NULL) {
 #line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp69_ = TRUE;
-#line 7062 "FacebookPublishing.c"
+			_tmp55_ = TRUE;
+#line 7502 "FacebookPublishing.c"
 		} else {
-			SoupMessage* _tmp73_;
-			SoupMessageBody* _tmp74_;
-			guint8* _tmp75_;
-			gint _tmp75__length1;
+			SoupMessageBody* _tmp58_;
+			guint8* _tmp59_;
+			gint _tmp59__length1;
 #line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp73_ = msg;
+			_tmp58_ = msg->response_body;
 #line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp74_ = _tmp73_->response_body;
+			_tmp59_ = _tmp58_->data;
 #line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp75_ = _tmp74_->data;
+			_tmp59__length1 = (gint) _tmp58_->length;
 #line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp75__length1 = (gint) _tmp74_->length;
-#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp69_ = _tmp75__length1 == 0;
-#line 7078 "FacebookPublishing.c"
+			_tmp55_ = _tmp59__length1 == 0;
+#line 7515 "FacebookPublishing.c"
 		}
 #line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		if (_tmp69_) {
-#line 7082 "FacebookPublishing.c"
-			PublishingFacebookGraphSessionGraphMessageImpl* _tmp76_;
-			gchar* _tmp77_;
-			gchar* _tmp78_;
-			GError* _tmp79_;
+		if (_tmp55_) {
+#line 7519 "FacebookPublishing.c"
+			PublishingFacebookGraphSessionGraphMessageImpl* _tmp60_;
+			gchar* _tmp61_;
+			gchar* _tmp62_;
+			GError* _tmp63_;
 #line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp76_ = real_message;
+			_tmp60_ = real_message;
 #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));
+			_tmp61_ = publishing_facebook_graph_message_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage));
 #line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp78_ = _tmp77_;
+			_tmp62_ = _tmp61_;
 #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_);
+			_tmp63_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "No response data from %s", _tmp62_);
 #line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_error_free0 (_error_);
 #line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_error_ = _tmp79_;
+			_error_ = _tmp63_;
 #line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_g_free0 (_tmp78_);
-#line 7101 "FacebookPublishing.c"
+			_g_free0 (_tmp62_);
+#line 7538 "FacebookPublishing.c"
 		}
 	}
 #line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp80_ = _error_;
+	_tmp64_ = _error_;
 #line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp80_ == NULL) {
-#line 7108 "FacebookPublishing.c"
-		PublishingFacebookGraphSessionGraphMessageImpl* _tmp81_;
+	if (_tmp64_ == NULL) {
+#line 7545 "FacebookPublishing.c"
+		PublishingFacebookGraphSessionGraphMessageImpl* _tmp65_;
 #line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp81_ = real_message;
+		_tmp65_ = real_message;
 #line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage), publishing_facebook_graph_message_signals[PUBLISHING_FACEBOOK_GRAPH_MESSAGE_COMPLETED_SIGNAL], 0);
-#line 7114 "FacebookPublishing.c"
+		g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage), publishing_facebook_graph_message_signals[PUBLISHING_FACEBOOK_GRAPH_MESSAGE_COMPLETED_SIGNAL], 0);
+#line 7551 "FacebookPublishing.c"
 	} else {
-		PublishingFacebookGraphSessionGraphMessageImpl* _tmp82_;
-		GError* _tmp83_;
+		PublishingFacebookGraphSessionGraphMessageImpl* _tmp66_;
+		GError* _tmp67_;
 #line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp82_ = real_message;
+		_tmp66_ = real_message;
 #line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp83_ = _error_;
+		_tmp67_ = _error_;
 #line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage), publishing_facebook_graph_message_signals[PUBLISHING_FACEBOOK_GRAPH_MESSAGE_FAILED_SIGNAL], 0, _tmp83_);
-#line 7124 "FacebookPublishing.c"
+		g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage), publishing_facebook_graph_message_signals[PUBLISHING_FACEBOOK_GRAPH_MESSAGE_FAILED_SIGNAL], 0, _tmp67_);
+#line 7561 "FacebookPublishing.c"
 	}
 #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_error_free0 (_error_);
 #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (real_message);
-#line 7130 "FacebookPublishing.c"
+#line 7567 "FacebookPublishing.c"
 }
 
 
-void publishing_facebook_graph_session_authenticate (PublishingFacebookGraphSession* self, const gchar* access_token) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
+void
+publishing_facebook_graph_session_authenticate (PublishingFacebookGraphSession* self,
+                                                const gchar* access_token)
+{
+	gchar* _tmp0_;
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self));
 #line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (access_token != NULL);
 #line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = access_token;
-#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (access_token);
 #line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->priv->access_token);
 #line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->access_token = _tmp1_;
+	self->priv->access_token = _tmp0_;
 #line 1260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_emit (self, publishing_facebook_graph_session_signals[PUBLISHING_FACEBOOK_GRAPH_SESSION_AUTHENTICATED_SIGNAL], 0);
-#line 7151 "FacebookPublishing.c"
+#line 7588 "FacebookPublishing.c"
 }
 
 
-gboolean publishing_facebook_graph_session_is_authenticated (PublishingFacebookGraphSession* self) {
+gboolean
+publishing_facebook_graph_session_is_authenticated (PublishingFacebookGraphSession* self)
+{
 	gboolean result = FALSE;
 	const gchar* _tmp0_;
 #line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -7182,41 +7621,43 @@ gboolean publishing_facebook_graph_session_is_authenticated (PublishingFacebookG
 	result = _tmp0_ != NULL;
 #line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 7166 "FacebookPublishing.c"
+#line 7605 "FacebookPublishing.c"
 }
 
 
-PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_query (PublishingFacebookGraphSession* self, const gchar* resource_path) {
+PublishingFacebookGraphMessage*
+publishing_facebook_graph_session_new_query (PublishingFacebookGraphSession* self,
+                                             const gchar* resource_path)
+{
 	PublishingFacebookGraphMessage* result = NULL;
 	const gchar* _tmp0_;
-	const gchar* _tmp1_;
-	PublishingFacebookGraphSessionGraphQueryMessage* _tmp2_;
+	PublishingFacebookGraphSessionGraphQueryMessage* _tmp1_;
 #line 1273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self), NULL);
 #line 1273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (resource_path != NULL, NULL);
 #line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = resource_path;
-#line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = self->priv->access_token;
+	_tmp0_ = self->priv->access_token;
 #line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = publishing_facebook_graph_session_graph_query_message_new (self, _tmp0_, _tmp1_);
+	_tmp1_ = publishing_facebook_graph_session_graph_query_message_new (self, resource_path, _tmp0_);
 #line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage);
+	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage);
 #line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 7189 "FacebookPublishing.c"
+#line 7628 "FacebookPublishing.c"
 }
 
 
-PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_upload (PublishingFacebookGraphSession* self, const gchar* resource_path, SpitPublishingPublishable* publishable, gboolean suppress_titling, const gchar* resource_privacy) {
+PublishingFacebookGraphMessage*
+publishing_facebook_graph_session_new_upload (PublishingFacebookGraphSession* self,
+                                              const gchar* resource_path,
+                                              SpitPublishingPublishable* publishable,
+                                              gboolean suppress_titling,
+                                              const gchar* resource_privacy)
+{
 	PublishingFacebookGraphMessage* result = NULL;
 	const gchar* _tmp0_;
-	const gchar* _tmp1_;
-	SpitPublishingPublishable* _tmp2_;
-	gboolean _tmp3_;
-	const gchar* _tmp4_;
-	PublishingFacebookGraphSessionGraphUploadMessage* _tmp5_;
+	PublishingFacebookGraphSessionGraphUploadMessage* _tmp1_;
 #line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self), NULL);
 #line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -7226,29 +7667,23 @@ PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_upload (Pu
 #line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->access_token;
 #line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = resource_path;
-#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = publishable;
-#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp3_ = suppress_titling;
+	_tmp1_ = publishing_facebook_graph_session_graph_upload_message_new (self, _tmp0_, resource_path, publishable, suppress_titling, resource_privacy);
 #line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp4_ = resource_privacy;
-#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 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage);
+	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage);
 #line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 7223 "FacebookPublishing.c"
+#line 7656 "FacebookPublishing.c"
 }
 
 
-PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_create_album (PublishingFacebookGraphSession* self, const gchar* album_name, const gchar* privacy) {
+PublishingFacebookGraphMessage*
+publishing_facebook_graph_session_new_create_album (PublishingFacebookGraphSession* self,
+                                                    const gchar* album_name,
+                                                    const gchar* privacy)
+{
 	PublishingFacebookGraphMessage* result = NULL;
 	const gchar* _tmp0_;
-	const gchar* _tmp1_;
-	const gchar* _tmp2_;
-	PublishingFacebookGraphSessionGraphCreateAlbumMessage* _tmp3_;
+	PublishingFacebookGraphSessionGraphCreateAlbumMessage* _tmp1_;
 #line 1283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self), NULL);
 #line 1283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -7258,100 +7693,92 @@ PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_create_alb
 #line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->access_token;
 #line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = album_name;
-#line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = privacy;
-#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_);
+	_tmp1_ = publishing_facebook_graph_session_graph_create_album_message_new (self, _tmp0_, album_name, privacy);
 #line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage);
+	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage);
 #line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 7251 "FacebookPublishing.c"
+#line 7682 "FacebookPublishing.c"
 }
 
 
-void publishing_facebook_graph_session_send_message (PublishingFacebookGraphSession* self, PublishingFacebookGraphMessage* message) {
+void
+publishing_facebook_graph_session_send_message (PublishingFacebookGraphSession* self,
+                                                PublishingFacebookGraphMessage* message)
+{
 	PublishingFacebookGraphSessionGraphMessageImpl* real_message = NULL;
-	PublishingFacebookGraphMessage* _tmp0_;
+	PublishingFacebookGraphSessionGraphMessageImpl* _tmp0_;
 	PublishingFacebookGraphSessionGraphMessageImpl* _tmp1_;
-	PublishingFacebookGraphSessionGraphMessageImpl* _tmp2_;
-	SoupMessage* _tmp3_;
+	SoupMessage* _tmp2_;
+	SoupURI* _tmp3_;
 	SoupURI* _tmp4_;
-	SoupURI* _tmp5_;
+	gchar* _tmp5_;
 	gchar* _tmp6_;
 	gchar* _tmp7_;
 	gchar* _tmp8_;
-	gchar* _tmp9_;
-	PublishingFacebookGraphSessionGraphMessageImpl* _tmp10_;
-	gboolean _tmp11_;
+	PublishingFacebookGraphSessionGraphMessageImpl* _tmp9_;
 #line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self));
 #line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
 #line 1288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = message;
-#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));
+	_tmp0_ = _publishing_facebook_graph_message_ref0 (G_TYPE_CHECK_INSTANCE_CAST (message, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl));
 #line 1288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	real_message = _tmp1_;
+	real_message = _tmp0_;
 #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = real_message;
+	_tmp1_ = real_message;
 #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp3_ = _tmp2_->soup_message;
+	_tmp2_ = _tmp1_->soup_message;
 #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp4_ = soup_message_get_uri (_tmp3_);
+	_tmp3_ = soup_message_get_uri (_tmp2_);
 #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = _tmp4_;
+	_tmp4_ = _tmp3_;
 #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp6_ = soup_uri_to_string (_tmp5_, FALSE);
+	_tmp5_ = soup_uri_to_string (_tmp4_, FALSE);
 #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp7_ = _tmp6_;
+	_tmp6_ = _tmp5_;
 #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp8_ = g_strconcat ("making HTTP request to URI: ", _tmp7_, NULL);
+	_tmp7_ = g_strconcat ("making HTTP request to URI: ", _tmp6_, NULL);
 #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp9_ = _tmp8_;
+	_tmp8_ = _tmp7_;
 #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:1290: %s", _tmp9_);
+	g_debug ("FacebookPublishing.vala:1290: %s", _tmp8_);
 #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (_tmp9_);
+	_g_free0 (_tmp8_);
 #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (_tmp7_);
-#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp10_ = real_message;
+	_g_free0 (_tmp6_);
 #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp11_ = publishing_facebook_graph_session_graph_message_impl_prepare_for_transmission (_tmp10_);
+	_tmp9_ = real_message;
 #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp11_) {
-#line 7307 "FacebookPublishing.c"
-		PublishingFacebookGraphMessage* _tmp12_;
-		SoupSession* _tmp13_;
-		PublishingFacebookGraphSessionGraphMessageImpl* _tmp14_;
-		SoupMessage* _tmp15_;
-		SoupMessage* _tmp16_;
+	if (publishing_facebook_graph_session_graph_message_impl_prepare_for_transmission (_tmp9_)) {
+#line 7735 "FacebookPublishing.c"
+		SoupSession* _tmp10_;
+		PublishingFacebookGraphSessionGraphMessageImpl* _tmp11_;
+		SoupMessage* _tmp12_;
+		SoupMessage* _tmp13_;
 #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp12_ = message;
-#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		publishing_facebook_graph_session_manage_message (self, _tmp12_);
+		publishing_facebook_graph_session_manage_message (self, message);
 #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp13_ = self->priv->soup_session;
+		_tmp10_ = self->priv->soup_session;
 #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp14_ = real_message;
+		_tmp11_ = real_message;
 #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp15_ = _tmp14_->soup_message;
+		_tmp12_ = _tmp11_->soup_message;
 #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp16_ = _g_object_ref0 (_tmp15_);
+		_tmp13_ = _g_object_ref0 (_tmp12_);
 #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		soup_session_queue_message (_tmp13_, _tmp16_, NULL, NULL);
-#line 7327 "FacebookPublishing.c"
+		soup_session_queue_message (_tmp10_, _tmp13_, NULL, NULL);
+#line 7752 "FacebookPublishing.c"
 	}
 #line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (real_message);
-#line 7331 "FacebookPublishing.c"
+#line 7756 "FacebookPublishing.c"
 }
 
 
-void publishing_facebook_graph_session_stop_transactions (PublishingFacebookGraphSession* self) {
+void
+publishing_facebook_graph_session_stop_transactions (PublishingFacebookGraphSession* self)
+{
 	SoupSession* _tmp0_;
 #line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self));
@@ -7359,19 +7786,22 @@ void publishing_facebook_graph_session_stop_transactions (PublishingFacebookGrap
 	_tmp0_ = self->priv->soup_session;
 #line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	soup_session_abort (_tmp0_);
-#line 7343 "FacebookPublishing.c"
+#line 7770 "FacebookPublishing.c"
 }
 
 
-static PublishingFacebookGraphSessionGraphMessageImpl* publishing_facebook_graph_session_graph_message_impl_construct (GType object_type, PublishingFacebookGraphSession* host_session, PublishingRESTSupportHttpMethod method, const gchar* relative_uri, const gchar* access_token, PublishingFacebookEndpoint endpoint) {
+static PublishingFacebookGraphSessionGraphMessageImpl*
+publishing_facebook_graph_session_graph_message_impl_construct (GType object_type,
+                                                                PublishingFacebookGraphSession* host_session,
+                                                                PublishingRESTSupportHttpMethod method,
+                                                                const gchar* relative_uri,
+                                                                const gchar* access_token,
+                                                                PublishingFacebookEndpoint endpoint)
+{
 	PublishingFacebookGraphSessionGraphMessageImpl* self = NULL;
-	PublishingRESTSupportHttpMethod _tmp0_;
-	const gchar* _tmp1_;
-	gchar* _tmp2_;
-	PublishingFacebookGraphSession* _tmp3_;
+	gchar* _tmp0_;
 	gchar* endpoint_uri = NULL;
-	PublishingFacebookEndpoint _tmp4_;
-	gchar* _tmp5_;
+	gchar* _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (host_session), NULL);
@@ -7382,48 +7812,39 @@ static PublishingFacebookGraphSessionGraphMessageImpl* publishing_facebook_graph
 #line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = (PublishingFacebookGraphSessionGraphMessageImpl*) publishing_facebook_graph_message_construct (object_type);
 #line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = method;
-#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->method = _tmp0_;
+	self->method = method;
 #line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = access_token;
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = g_strdup (_tmp1_);
+	_tmp0_ = g_strdup (access_token);
 #line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->access_token);
 #line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->access_token = _tmp2_;
-#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp3_ = host_session;
+	self->access_token = _tmp0_;
 #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->host_session = _tmp3_;
+	self->host_session = host_session;
 #line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->bytes_so_far = 0;
 #line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp4_ = endpoint;
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = publishing_facebook_endpoint_to_uri (_tmp4_);
+	_tmp1_ = publishing_facebook_endpoint_to_uri (endpoint);
 #line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	endpoint_uri = _tmp5_;
-#line 7389 "FacebookPublishing.c"
+	endpoint_uri = _tmp1_;
+#line 7811 "FacebookPublishing.c"
 	{
 		GRegex* starting_slashes = NULL;
-		GRegex* _tmp6_;
-		gchar* _tmp7_ = NULL;
-		GRegex* _tmp8_;
-		const gchar* _tmp9_;
-		gchar* _tmp10_;
-		const gchar* _tmp11_;
-		gchar* _tmp12_;
+		GRegex* _tmp2_;
+		gchar* _tmp3_ = NULL;
+		GRegex* _tmp4_;
+		gchar* _tmp5_;
+		const gchar* _tmp6_;
+		gchar* _tmp7_;
 #line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp6_ = g_regex_new ("^/+", 0, 0, &_inner_error_);
+		_tmp2_ = g_regex_new ("^/+", 0, 0, &_inner_error_);
 #line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		starting_slashes = _tmp6_;
+		starting_slashes = _tmp2_;
 #line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 7407 "FacebookPublishing.c"
+#line 7828 "FacebookPublishing.c"
 				goto __catch4_g_regex_error;
 			}
 #line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -7434,23 +7855,21 @@ static PublishingFacebookGraphSessionGraphMessageImpl* publishing_facebook_graph
 			g_clear_error (&_inner_error_);
 #line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return NULL;
-#line 7418 "FacebookPublishing.c"
+#line 7839 "FacebookPublishing.c"
 		}
 #line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp8_ = starting_slashes;
+		_tmp4_ = starting_slashes;
 #line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp9_ = relative_uri;
+		_tmp5_ = g_regex_replace (_tmp4_, relative_uri, (gssize) -1, 0, "", 0, &_inner_error_);
 #line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp10_ = g_regex_replace (_tmp8_, _tmp9_, (gssize) -1, 0, "", 0, &_inner_error_);
-#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp7_ = _tmp10_;
+		_tmp3_ = _tmp5_;
 #line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_regex_unref0 (starting_slashes);
 #line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 7434 "FacebookPublishing.c"
+#line 7853 "FacebookPublishing.c"
 				goto __catch4_g_regex_error;
 			}
 #line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -7463,21 +7882,21 @@ static PublishingFacebookGraphSessionGraphMessageImpl* publishing_facebook_graph
 			g_clear_error (&_inner_error_);
 #line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return NULL;
-#line 7447 "FacebookPublishing.c"
+#line 7866 "FacebookPublishing.c"
 		}
 #line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp11_ = endpoint_uri;
+		_tmp6_ = endpoint_uri;
 #line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp12_ = g_strconcat (_tmp11_, _tmp7_, NULL);
+		_tmp7_ = g_strconcat (_tmp6_, _tmp3_, NULL);
 #line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (self->uri);
 #line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		self->uri = _tmp12_;
+		self->uri = _tmp7_;
 #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_g_free0 (_tmp7_);
+		_g_free0 (_tmp3_);
 #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_regex_unref0 (starting_slashes);
-#line 7461 "FacebookPublishing.c"
+#line 7880 "FacebookPublishing.c"
 	}
 	goto __finally4;
 	__catch4_g_regex_error:
@@ -7491,7 +7910,7 @@ static PublishingFacebookGraphSessionGraphMessageImpl* publishing_facebook_graph
 		g_assert_not_reached ();
 #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_error_free0 (err);
-#line 7475 "FacebookPublishing.c"
+#line 7894 "FacebookPublishing.c"
 	}
 	__finally4:
 #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -7504,36 +7923,42 @@ static PublishingFacebookGraphSessionGraphMessageImpl* publishing_facebook_graph
 		g_clear_error (&_inner_error_);
 #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return NULL;
-#line 7488 "FacebookPublishing.c"
+#line 7907 "FacebookPublishing.c"
 	}
 #line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (endpoint_uri);
 #line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 7494 "FacebookPublishing.c"
+#line 7913 "FacebookPublishing.c"
 }
 
 
-static gboolean publishing_facebook_graph_session_graph_message_impl_real_prepare_for_transmission (PublishingFacebookGraphSessionGraphMessageImpl* self) {
+static gboolean
+publishing_facebook_graph_session_graph_message_impl_real_prepare_for_transmission (PublishingFacebookGraphSessionGraphMessageImpl* self)
+{
 	gboolean result = FALSE;
 #line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = TRUE;
 #line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 7504 "FacebookPublishing.c"
+#line 7925 "FacebookPublishing.c"
 }
 
 
-gboolean publishing_facebook_graph_session_graph_message_impl_prepare_for_transmission (PublishingFacebookGraphSessionGraphMessageImpl* self) {
+gboolean
+publishing_facebook_graph_session_graph_message_impl_prepare_for_transmission (PublishingFacebookGraphSessionGraphMessageImpl* self)
+{
 #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 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 7513 "FacebookPublishing.c"
+#line 7936 "FacebookPublishing.c"
 }
 
 
-static gchar* publishing_facebook_graph_session_graph_message_impl_real_get_uri (PublishingFacebookGraphMessage* base) {
+static gchar*
+publishing_facebook_graph_session_graph_message_impl_real_get_uri (PublishingFacebookGraphMessage* base)
+{
 	PublishingFacebookGraphSessionGraphMessageImpl * self;
 	gchar* result = NULL;
 	const gchar* _tmp0_;
@@ -7548,11 +7973,13 @@ static gchar* publishing_facebook_graph_session_graph_message_impl_real_get_uri
 	result = _tmp1_;
 #line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 7532 "FacebookPublishing.c"
+#line 7957 "FacebookPublishing.c"
 }
 
 
-static gchar* publishing_facebook_graph_session_graph_message_impl_real_get_response_body (PublishingFacebookGraphMessage* base) {
+static gchar*
+publishing_facebook_graph_session_graph_message_impl_real_get_response_body (PublishingFacebookGraphMessage* base)
+{
 	PublishingFacebookGraphSessionGraphMessageImpl * self;
 	gchar* result = NULL;
 	SoupMessage* _tmp0_;
@@ -7576,18 +8003,20 @@ static gchar* publishing_facebook_graph_session_graph_message_impl_real_get_resp
 	result = _tmp3_;
 #line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 7560 "FacebookPublishing.c"
+#line 7987 "FacebookPublishing.c"
 }
 
 
-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 (PublishingFacebookGraphSessionGraphMessageImpl* self,
+                                                                         SoupBuffer* chunk)
+{
 	gint _tmp0_;
-	SoupBuffer* _tmp1_;
-	gsize _tmp2_;
-	gint _tmp3_;
-	SoupMessage* _tmp4_;
-	SoupMessageBody* _tmp5_;
-	gint64 _tmp6_;
+	gsize _tmp1_;
+	gint _tmp2_;
+	SoupMessage* _tmp3_;
+	SoupMessageBody* _tmp4_;
+	gint64 _tmp5_;
 #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 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -7595,26 +8024,26 @@ static void publishing_facebook_graph_session_graph_message_impl_on_wrote_body_d
 #line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->bytes_so_far;
 #line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = chunk;
-#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = _tmp1_->length;
+	_tmp1_ = chunk->length;
 #line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->bytes_so_far = _tmp0_ + ((gint) _tmp2_);
+	self->bytes_so_far = _tmp0_ + ((gint) _tmp1_);
 #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp3_ = self->bytes_so_far;
+	_tmp2_ = self->bytes_so_far;
 #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp4_ = self->soup_message;
+	_tmp3_ = self->soup_message;
 #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = _tmp4_->request_body;
+	_tmp4_ = _tmp3_->request_body;
 #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp6_ = _tmp5_->length;
+	_tmp5_ = _tmp4_->length;
 #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage), publishing_facebook_graph_message_signals[PUBLISHING_FACEBOOK_GRAPH_MESSAGE_DATA_TRANSMITTED_SIGNAL], 0, _tmp3_, (gint) _tmp6_);
-#line 7594 "FacebookPublishing.c"
+	g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage), publishing_facebook_graph_message_signals[PUBLISHING_FACEBOOK_GRAPH_MESSAGE_DATA_TRANSMITTED_SIGNAL], 0, _tmp2_, (gint) _tmp5_);
+#line 8021 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_graph_session_graph_message_impl_class_init (PublishingFacebookGraphSessionGraphMessageImplClass * klass) {
+static void
+publishing_facebook_graph_session_graph_message_impl_class_init (PublishingFacebookGraphSessionGraphMessageImplClass * klass)
+{
 #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 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -7625,15 +8054,19 @@ static void publishing_facebook_graph_session_graph_message_impl_class_init (Pub
 	((PublishingFacebookGraphMessageClass *) klass)->get_uri = (gchar* (*) (PublishingFacebookGraphMessage *)) publishing_facebook_graph_session_graph_message_impl_real_get_uri;
 #line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookGraphMessageClass *) klass)->get_response_body = (gchar* (*) (PublishingFacebookGraphMessage *)) publishing_facebook_graph_session_graph_message_impl_real_get_response_body;
-#line 7609 "FacebookPublishing.c"
+#line 8038 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_graph_session_graph_message_impl_instance_init (PublishingFacebookGraphSessionGraphMessageImpl * self) {
+static void
+publishing_facebook_graph_session_graph_message_impl_instance_init (PublishingFacebookGraphSessionGraphMessageImpl * self)
+{
 }
 
 
-static void publishing_facebook_graph_session_graph_message_impl_finalize (PublishingFacebookGraphMessage * obj) {
+static void
+publishing_facebook_graph_session_graph_message_impl_finalize (PublishingFacebookGraphMessage * obj)
+{
 	PublishingFacebookGraphSessionGraphMessageImpl * self;
 #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);
@@ -7645,11 +8078,13 @@ static void publishing_facebook_graph_session_graph_message_impl_finalize (Publi
 	_g_object_unref0 (self->soup_message);
 #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 7629 "FacebookPublishing.c"
+#line 8062 "FacebookPublishing.c"
 }
 
 
-static GType publishing_facebook_graph_session_graph_message_impl_get_type (void) {
+static GType
+publishing_facebook_graph_session_graph_message_impl_get_type (void)
+{
 	static volatile gsize publishing_facebook_graph_session_graph_message_impl_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_facebook_graph_session_graph_message_impl_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingFacebookGraphSessionGraphMessageImplClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_facebook_graph_session_graph_message_impl_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFacebookGraphSessionGraphMessageImpl), 0, (GInstanceInitFunc) publishing_facebook_graph_session_graph_message_impl_instance_init, NULL };
@@ -7661,32 +8096,35 @@ static GType publishing_facebook_graph_session_graph_message_impl_get_type (void
 }
 
 
-static void _vala_SoupURI_free (SoupURI* self) {
+static void
+_vala_SoupURI_free (SoupURI* self)
+{
 #line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_boxed_free (soup_uri_get_type (), self);
-#line 7648 "FacebookPublishing.c"
+#line 8085 "FacebookPublishing.c"
 }
 
 
-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 PublishingFacebookGraphSessionGraphQueryMessage*
+publishing_facebook_graph_session_graph_query_message_construct (GType object_type,
+                                                                 PublishingFacebookGraphSession* host_session,
+                                                                 const gchar* relative_uri,
+                                                                 const gchar* access_token)
+{
 	PublishingFacebookGraphSessionGraphQueryMessage* self = NULL;
-	PublishingFacebookGraphSession* _tmp0_;
-	const gchar* _tmp1_;
-	const gchar* _tmp2_;
 	SoupURI* destination_uri = NULL;
-	const gchar* _tmp3_;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 	gchar* _tmp4_;
-	gchar* _tmp5_;
-	const gchar* _tmp6_;
-	gchar* _tmp7_;
+	SoupURI* _tmp5_;
+	SoupURI* _tmp6_;
+	PublishingRESTSupportHttpMethod _tmp7_;
 	gchar* _tmp8_;
-	SoupURI* _tmp9_;
-	SoupURI* _tmp10_;
-	PublishingRESTSupportHttpMethod _tmp11_;
-	gchar* _tmp12_;
-	gchar* _tmp13_;
-	SoupMessage* _tmp14_;
-	SoupMessage* _tmp15_;
+	gchar* _tmp9_;
+	SoupMessage* _tmp10_;
+	SoupMessage* _tmp11_;
 #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 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -7694,80 +8132,82 @@ static PublishingFacebookGraphSessionGraphQueryMessage* publishing_facebook_grap
 #line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (access_token != NULL, NULL);
 #line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = host_session;
-#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = relative_uri;
-#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = access_token;
-#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 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;
+	self = (PublishingFacebookGraphSessionGraphQueryMessage*) publishing_facebook_graph_session_graph_message_impl_construct (object_type, host_session, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET, relative_uri, access_token, PUBLISHING_FACEBOOK_ENDPOINT_DEFAULT);
 #line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp4_ = g_strconcat (_tmp3_, "?access_token=", NULL);
+	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->uri;
 #line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = _tmp4_;
+	_tmp1_ = g_strconcat (_tmp0_, "?access_token=", NULL);
 #line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp6_ = access_token;
+	_tmp2_ = _tmp1_;
 #line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp7_ = g_strconcat (_tmp5_, _tmp6_, NULL);
+	_tmp3_ = g_strconcat (_tmp2_, access_token, NULL);
 #line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp8_ = _tmp7_;
+	_tmp4_ = _tmp3_;
 #line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp9_ = soup_uri_new (_tmp8_);
+	_tmp5_ = soup_uri_new (_tmp4_);
 #line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp10_ = _tmp9_;
+	_tmp6_ = _tmp5_;
 #line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (_tmp8_);
+	_g_free0 (_tmp4_);
 #line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (_tmp5_);
+	_g_free0 (_tmp2_);
 #line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	destination_uri = _tmp10_;
+	destination_uri = _tmp6_;
 #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;
+	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->method;
 #line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp12_ = publishing_rest_support_http_method_to_string (_tmp11_);
+	_tmp8_ = publishing_rest_support_http_method_to_string (_tmp7_);
 #line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp13_ = _tmp12_;
+	_tmp9_ = _tmp8_;
 #line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp14_ = soup_message_new_from_uri (_tmp13_, destination_uri);
+	_tmp10_ = soup_message_new_from_uri (_tmp9_, destination_uri);
 #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 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_;
+	G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message = _tmp10_;
 #line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (_tmp13_);
+	_g_free0 (_tmp9_);
 #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;
+	_tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message;
 #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));
+	g_signal_connect (_tmp11_, "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 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	__vala_SoupURI_free0 (destination_uri);
 #line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 7729 "FacebookPublishing.c"
+#line 8159 "FacebookPublishing.c"
 }
 
 
-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_new (PublishingFacebookGraphSession* host_session,
+                                                           const gchar* relative_uri,
+                                                           const gchar* access_token)
+{
 #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 7736 "FacebookPublishing.c"
+#line 8170 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_graph_session_graph_query_message_class_init (PublishingFacebookGraphSessionGraphQueryMessageClass * klass) {
+static void
+publishing_facebook_graph_session_graph_query_message_class_init (PublishingFacebookGraphSessionGraphQueryMessageClass * klass)
+{
 #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 7743 "FacebookPublishing.c"
+#line 8179 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_graph_session_graph_query_message_instance_init (PublishingFacebookGraphSessionGraphQueryMessage * self) {
+static void
+publishing_facebook_graph_session_graph_query_message_instance_init (PublishingFacebookGraphSessionGraphQueryMessage * self)
+{
 }
 
 
-static GType publishing_facebook_graph_session_graph_query_message_get_type (void) {
+static GType
+publishing_facebook_graph_session_graph_query_message_get_type (void)
+{
 	static volatile gsize publishing_facebook_graph_session_graph_query_message_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_facebook_graph_session_graph_query_message_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingFacebookGraphSessionGraphQueryMessageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_facebook_graph_session_graph_query_message_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFacebookGraphSessionGraphQueryMessage), 0, (GInstanceInitFunc) publishing_facebook_graph_session_graph_query_message_instance_init, NULL };
@@ -7779,74 +8219,82 @@ static GType publishing_facebook_graph_session_graph_query_message_get_type (voi
 }
 
 
-static PublishingFacebookGraphSessionGraphEndpointProbeMessage* publishing_facebook_graph_session_graph_endpoint_probe_message_construct (GType object_type, PublishingFacebookGraphSession* host_session) {
+static PublishingFacebookGraphSessionGraphEndpointProbeMessage*
+publishing_facebook_graph_session_graph_endpoint_probe_message_construct (GType object_type,
+                                                                          PublishingFacebookGraphSession* host_session)
+{
 	PublishingFacebookGraphSessionGraphEndpointProbeMessage* self = NULL;
-	PublishingFacebookGraphSession* _tmp0_;
-	PublishingRESTSupportHttpMethod _tmp1_;
+	PublishingRESTSupportHttpMethod _tmp0_;
+	gchar* _tmp1_;
 	gchar* _tmp2_;
-	gchar* _tmp3_;
-	const gchar* _tmp4_;
+	const gchar* _tmp3_;
+	SoupURI* _tmp4_;
 	SoupURI* _tmp5_;
-	SoupURI* _tmp6_;
+	SoupMessage* _tmp6_;
 	SoupMessage* _tmp7_;
-	SoupMessage* _tmp8_;
 #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 1053 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = host_session;
-#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);
+	self = (PublishingFacebookGraphSessionGraphEndpointProbeMessage*) publishing_facebook_graph_session_graph_message_impl_construct (object_type, host_session, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET, "/", "", PUBLISHING_FACEBOOK_ENDPOINT_TEST_CONNECTION);
 #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;
+	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->method;
 #line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = publishing_rest_support_http_method_to_string (_tmp1_);
+	_tmp1_ = publishing_rest_support_http_method_to_string (_tmp0_);
 #line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp3_ = _tmp2_;
+	_tmp2_ = _tmp1_;
 #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;
+	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->uri;
 #line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = soup_uri_new (_tmp4_);
+	_tmp4_ = soup_uri_new (_tmp3_);
 #line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp6_ = _tmp5_;
+	_tmp5_ = _tmp4_;
 #line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp7_ = soup_message_new_from_uri (_tmp3_, _tmp6_);
+	_tmp6_ = soup_message_new_from_uri (_tmp2_, _tmp5_);
 #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 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_;
+	G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message = _tmp6_;
 #line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	__vala_SoupURI_free0 (_tmp6_);
+	__vala_SoupURI_free0 (_tmp5_);
 #line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (_tmp3_);
+	_g_free0 (_tmp2_);
 #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;
+	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message;
 #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));
+	g_signal_connect (_tmp7_, "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 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 7808 "FacebookPublishing.c"
+#line 8248 "FacebookPublishing.c"
 }
 
 
-static PublishingFacebookGraphSessionGraphEndpointProbeMessage* publishing_facebook_graph_session_graph_endpoint_probe_message_new (PublishingFacebookGraphSession* host_session) {
+static PublishingFacebookGraphSessionGraphEndpointProbeMessage*
+publishing_facebook_graph_session_graph_endpoint_probe_message_new (PublishingFacebookGraphSession* host_session)
+{
 #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 7815 "FacebookPublishing.c"
+#line 8257 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_graph_session_graph_endpoint_probe_message_class_init (PublishingFacebookGraphSessionGraphEndpointProbeMessageClass * klass) {
+static void
+publishing_facebook_graph_session_graph_endpoint_probe_message_class_init (PublishingFacebookGraphSessionGraphEndpointProbeMessageClass * klass)
+{
 #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 7822 "FacebookPublishing.c"
+#line 8266 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_graph_session_graph_endpoint_probe_message_instance_init (PublishingFacebookGraphSessionGraphEndpointProbeMessage * self) {
+static void
+publishing_facebook_graph_session_graph_endpoint_probe_message_instance_init (PublishingFacebookGraphSessionGraphEndpointProbeMessage * self)
+{
 }
 
 
-static GType publishing_facebook_graph_session_graph_endpoint_probe_message_get_type (void) {
+static GType
+publishing_facebook_graph_session_graph_endpoint_probe_message_get_type (void)
+{
 	static volatile gsize publishing_facebook_graph_session_graph_endpoint_probe_message_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_facebook_graph_session_graph_endpoint_probe_message_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingFacebookGraphSessionGraphEndpointProbeMessageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_facebook_graph_session_graph_endpoint_probe_message_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFacebookGraphSessionGraphEndpointProbeMessage), 0, (GInstanceInitFunc) publishing_facebook_graph_session_graph_endpoint_probe_message_instance_init, NULL };
@@ -7858,103 +8306,97 @@ static GType publishing_facebook_graph_session_graph_endpoint_probe_message_get_
 }
 
 
-static gchar* g_date_time_to_string (GDateTime* self) {
+static gchar*
+g_date_time_to_string (GDateTime* self)
+{
 	gchar* result = NULL;
 	gchar* _tmp0_;
-#line 2930 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 2952 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 2931 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 2953 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	_tmp0_ = g_date_time_format (self, "%FT%H:%M:%S%z");
-#line 2931 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 2953 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	result = _tmp0_;
-#line 2931 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 2953 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	return result;
-#line 7853 "FacebookPublishing.c"
+#line 8303 "FacebookPublishing.c"
 }
 
 
-static void _vala_SoupMultipart_free (SoupMultipart* self) {
+static void
+_vala_SoupMultipart_free (SoupMultipart* self)
+{
 #line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_boxed_free (soup_multipart_get_type (), self);
-#line 7860 "FacebookPublishing.c"
+#line 8312 "FacebookPublishing.c"
 }
 
 
-static void _vala_SoupBuffer_free (SoupBuffer* self) {
+static void
+_vala_SoupBuffer_free (SoupBuffer* self)
+{
 #line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_boxed_free (soup_buffer_get_type (), self);
-#line 7867 "FacebookPublishing.c"
+#line 8321 "FacebookPublishing.c"
 }
 
 
-static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_graph_session_graph_upload_message_construct (GType object_type, PublishingFacebookGraphSession* host_session, const gchar* access_token, const gchar* relative_uri, SpitPublishingPublishable* publishable, gboolean suppress_titling, const gchar* resource_privacy) {
+static PublishingFacebookGraphSessionGraphUploadMessage*
+publishing_facebook_graph_session_graph_upload_message_construct (GType object_type,
+                                                                  PublishingFacebookGraphSession* host_session,
+                                                                  const gchar* access_token,
+                                                                  const gchar* relative_uri,
+                                                                  SpitPublishingPublishable* publishable,
+                                                                  gboolean suppress_titling,
+                                                                  const gchar* resource_privacy)
+{
 	PublishingFacebookGraphSessionGraphUploadMessage* self = NULL;
 	PublishingFacebookEndpoint _tmp0_ = 0;
-	SpitPublishingPublishable* _tmp1_;
-	SpitPublishingPublisherMediaType _tmp2_;
-	PublishingFacebookGraphSession* _tmp3_;
-	const gchar* _tmp4_;
-	const gchar* _tmp5_;
-	gboolean _tmp6_ = FALSE;
-	SpitPublishingPublishable* _tmp7_;
-	SpitPublishingPublisherMediaType _tmp8_;
-	SpitPublishingPublishable* _tmp10_;
-	SpitPublishingPublishable* _tmp11_;
-	PublishingRESTSupportHttpMethod _tmp21_;
-	gchar* _tmp22_;
-	gchar* _tmp23_;
-	const gchar* _tmp24_;
-	SoupURI* _tmp25_;
-	SoupURI* _tmp26_;
-	SoupMessage* _tmp27_;
-	SoupMessage* _tmp28_;
+	gboolean _tmp1_ = FALSE;
+	SpitPublishingPublishable* _tmp2_;
+	PublishingRESTSupportHttpMethod _tmp11_;
+	gchar* _tmp12_;
+	gchar* _tmp13_;
+	const gchar* _tmp14_;
+	SoupURI* _tmp15_;
+	SoupURI* _tmp16_;
+	SoupMessage* _tmp17_;
+	SoupMessage* _tmp18_;
 	guint8* payload = NULL;
-	GMappedFile* _tmp29_;
-	gchar* _tmp30_;
+	GMappedFile* _tmp19_;
+	gchar* _tmp20_;
 	gint payload_length1;
 	gint _payload_size_;
-	GMappedFile* _tmp31_;
-	gsize _tmp32_;
-	gint _tmp33_;
+	GMappedFile* _tmp21_;
+	gint _tmp22_;
 	SoupBuffer* image_data = NULL;
-	guint8* _tmp34_;
-	gint _tmp34__length1;
-	SoupBuffer* _tmp35_;
+	guint8* _tmp23_;
+	gint _tmp23__length1;
+	SoupBuffer* _tmp24_;
 	SoupMultipart* mp_envelope = NULL;
-	SoupMultipart* _tmp36_;
-	SoupMultipart* _tmp37_;
-	const gchar* _tmp38_;
-	SpitPublishingPublishable* _tmp39_;
-	SpitPublishingPublisherMediaType _tmp40_;
+	SoupMultipart* _tmp25_;
+	SoupMultipart* _tmp26_;
 	gchar* publishable_title = NULL;
-	SpitPublishingPublishable* _tmp43_;
-	gchar* _tmp44_;
-	gboolean _tmp45_ = FALSE;
-	gboolean _tmp46_;
+	gchar* _tmp28_;
+	gboolean _tmp29_ = FALSE;
 	gchar* publishable_comment = NULL;
-	SpitPublishingPublishable* _tmp50_;
-	gchar* _tmp51_;
-	gboolean _tmp52_ = FALSE;
-	gboolean _tmp53_;
-	gboolean _tmp57_;
-	const gchar* _tmp64_ = NULL;
-	SpitPublishingPublishable* _tmp65_;
-	SpitPublishingPublisherMediaType _tmp66_;
+	gchar* _tmp33_;
+	gboolean _tmp34_ = FALSE;
+	const gchar* _tmp43_ = NULL;
 	gchar* source_file_mime_type = NULL;
-	gchar* _tmp67_;
-	SoupMultipart* _tmp68_;
-	SpitPublishingPublishable* _tmp69_;
-	GFile* _tmp70_;
-	GFile* _tmp71_;
-	gchar* _tmp72_;
-	gchar* _tmp73_;
-	const gchar* _tmp74_;
-	SoupBuffer* _tmp75_;
-	SoupMultipart* _tmp76_;
-	SoupMessage* _tmp77_;
-	SoupMessageHeaders* _tmp78_;
-	SoupMessage* _tmp79_;
-	SoupMessageBody* _tmp80_;
+	gchar* _tmp44_;
+	SoupMultipart* _tmp45_;
+	GFile* _tmp46_;
+	GFile* _tmp47_;
+	gchar* _tmp48_;
+	gchar* _tmp49_;
+	const gchar* _tmp50_;
+	SoupBuffer* _tmp51_;
+	SoupMultipart* _tmp52_;
+	SoupMessage* _tmp53_;
+	SoupMessageHeaders* _tmp54_;
+	SoupMessage* _tmp55_;
+	SoupMessageBody* _tmp56_;
 	GError * _inner_error_ = NULL;
 #line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (host_session), NULL);
@@ -7965,90 +8407,68 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra
 #line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = publishable;
-#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = spit_publishing_publishable_get_media_type (_tmp1_);
-#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp2_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+	if (spit_publishing_publishable_get_media_type (publishable) == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
 #line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = PUBLISHING_FACEBOOK_ENDPOINT_VIDEO;
-#line 7956 "FacebookPublishing.c"
+#line 8394 "FacebookPublishing.c"
 	} else {
 #line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = PUBLISHING_FACEBOOK_ENDPOINT_DEFAULT;
-#line 7960 "FacebookPublishing.c"
+#line 8398 "FacebookPublishing.c"
 	}
 #line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp3_ = host_session;
-#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp4_ = relative_uri;
-#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = access_token;
-#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 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp7_ = publishable;
-#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp8_ = spit_publishing_publishable_get_media_type (_tmp7_);
+	self = (PublishingFacebookGraphSessionGraphUploadMessage*) publishing_facebook_graph_session_graph_message_impl_construct (object_type, host_session, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST, relative_uri, access_token, _tmp0_);
 #line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp8_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+	if (spit_publishing_publishable_get_media_type (publishable) != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
 #line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp6_ = TRUE;
-#line 7978 "FacebookPublishing.c"
+		_tmp1_ = TRUE;
+#line 8406 "FacebookPublishing.c"
 	} else {
-		const gchar* _tmp9_;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp9_ = resource_privacy;
 #line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp6_ = _tmp9_ != NULL;
-#line 7985 "FacebookPublishing.c"
+		_tmp1_ = resource_privacy != NULL;
+#line 8410 "FacebookPublishing.c"
 	}
 #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");
+	_vala_assert (_tmp1_, "publishable.get_media_type() != Spit.Publishing.Publisher.MediaType.VIDEO ||                 resource_privacy != null");
 #line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp10_ = publishable;
-#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp11_ = _g_object_ref0 (_tmp10_);
+	_tmp2_ = _g_object_ref0 (publishable);
 #line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->publishable);
 #line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->publishable = _tmp11_;
-#line 7997 "FacebookPublishing.c"
+	self->priv->publishable = _tmp2_;
+#line 8420 "FacebookPublishing.c"
 	{
-		GMappedFile* _tmp12_ = NULL;
-		SpitPublishingPublishable* _tmp13_;
-		GFile* _tmp14_;
-		GFile* _tmp15_;
-		gchar* _tmp16_;
-		gchar* _tmp17_;
-		GMappedFile* _tmp18_;
-		GMappedFile* _tmp19_;
-		GMappedFile* _tmp20_;
-#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp13_ = publishable;
+		GMappedFile* _tmp3_ = NULL;
+		GFile* _tmp4_;
+		GFile* _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
+		GMappedFile* _tmp8_;
+		GMappedFile* _tmp9_;
+		GMappedFile* _tmp10_;
 #line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp14_ = spit_publishing_publishable_get_serialized_file (_tmp13_);
+		_tmp4_ = spit_publishing_publishable_get_serialized_file (publishable);
 #line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp15_ = _tmp14_;
+		_tmp5_ = _tmp4_;
 #line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp16_ = g_file_get_path (_tmp15_);
+		_tmp6_ = g_file_get_path (_tmp5_);
 #line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp17_ = _tmp16_;
+		_tmp7_ = _tmp6_;
 #line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp18_ = g_mapped_file_new (_tmp17_, FALSE, &_inner_error_);
+		_tmp8_ = g_mapped_file_new (_tmp7_, FALSE, &_inner_error_);
 #line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp19_ = _tmp18_;
+		_tmp9_ = _tmp8_;
 #line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_g_free0 (_tmp17_);
+		_g_free0 (_tmp7_);
 #line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_g_object_unref0 (_tmp15_);
+		_g_object_unref0 (_tmp5_);
 #line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp12_ = _tmp19_;
+		_tmp3_ = _tmp9_;
 #line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			if (_inner_error_->domain == G_FILE_ERROR) {
-#line 8032 "FacebookPublishing.c"
+#line 8452 "FacebookPublishing.c"
 				goto __catch5_g_file_error;
 			}
 #line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -8057,19 +8477,19 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra
 			g_clear_error (&_inner_error_);
 #line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return NULL;
-#line 8041 "FacebookPublishing.c"
+#line 8461 "FacebookPublishing.c"
 		}
 #line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp20_ = _tmp12_;
+		_tmp10_ = _tmp3_;
 #line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp12_ = NULL;
+		_tmp3_ = NULL;
 #line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_mapped_file_unref0 (self->priv->mapped_file);
 #line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		self->priv->mapped_file = _tmp20_;
+		self->priv->mapped_file = _tmp10_;
 #line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_g_mapped_file_unref0 (_tmp12_);
-#line 8053 "FacebookPublishing.c"
+		_g_mapped_file_unref0 (_tmp3_);
+#line 8473 "FacebookPublishing.c"
 	}
 	goto __finally5;
 	__catch5_g_file_error:
@@ -8083,7 +8503,7 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra
 		_g_error_free0 (e);
 #line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return self;
-#line 8067 "FacebookPublishing.c"
+#line 8487 "FacebookPublishing.c"
 	}
 	__finally5:
 #line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -8094,240 +8514,210 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra
 		g_clear_error (&_inner_error_);
 #line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return NULL;
-#line 8078 "FacebookPublishing.c"
+#line 8498 "FacebookPublishing.c"
 	}
 #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;
+	_tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->method;
 #line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp22_ = publishing_rest_support_http_method_to_string (_tmp21_);
+	_tmp12_ = publishing_rest_support_http_method_to_string (_tmp11_);
 #line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp23_ = _tmp22_;
+	_tmp13_ = _tmp12_;
 #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;
+	_tmp14_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->uri;
 #line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp25_ = soup_uri_new (_tmp24_);
+	_tmp15_ = soup_uri_new (_tmp14_);
 #line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp26_ = _tmp25_;
+	_tmp16_ = _tmp15_;
 #line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp27_ = soup_message_new_from_uri (_tmp23_, _tmp26_);
+	_tmp17_ = soup_message_new_from_uri (_tmp13_, _tmp16_);
 #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 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_;
+	G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message = _tmp17_;
 #line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	__vala_SoupURI_free0 (_tmp26_);
+	__vala_SoupURI_free0 (_tmp16_);
 #line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (_tmp23_);
+	_g_free0 (_tmp13_);
 #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;
+	_tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message;
 #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));
+	g_signal_connect (_tmp18_, "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 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp29_ = self->priv->mapped_file;
+	_tmp19_ = self->priv->mapped_file;
 #line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp30_ = g_mapped_file_get_contents (_tmp29_);
+	_tmp20_ = g_mapped_file_get_contents (_tmp19_);
 #line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	payload = (guint8*) _tmp30_;
+	payload = (guint8*) _tmp20_;
 #line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	payload_length1 = sizeof (gchar) / sizeof (guint8);
 #line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_payload_size_ = payload_length1;
 #line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp31_ = self->priv->mapped_file;
-#line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp32_ = g_mapped_file_get_length (_tmp31_);
+	_tmp21_ = self->priv->mapped_file;
 #line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	payload_length1 = (gint) _tmp32_;
+	payload_length1 = (gint) g_mapped_file_get_length (_tmp21_);
 #line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp33_ = payload_length1;
+	_tmp22_ = payload_length1;
 #line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp34_ = payload;
+	_tmp23_ = payload;
 #line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp34__length1 = payload_length1;
+	_tmp23__length1 = payload_length1;
 #line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp35_ = soup_buffer_new (SOUP_MEMORY_TEMPORARY, _tmp34_, _tmp34__length1);
+	_tmp24_ = soup_buffer_new (SOUP_MEMORY_TEMPORARY, _tmp23_, _tmp23__length1);
 #line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	image_data = _tmp35_;
+	image_data = _tmp24_;
 #line 1096 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp36_ = soup_multipart_new ("multipart/form-data");
+	_tmp25_ = soup_multipart_new ("multipart/form-data");
 #line 1096 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	mp_envelope = _tmp36_;
+	mp_envelope = _tmp25_;
 #line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp37_ = mp_envelope;
+	_tmp26_ = mp_envelope;
 #line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp38_ = access_token;
-#line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	soup_multipart_append_form_string (_tmp37_, "access_token", _tmp38_);
-#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp39_ = publishable;
-#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp40_ = spit_publishing_publishable_get_media_type (_tmp39_);
+	soup_multipart_append_form_string (_tmp26_, "access_token", access_token);
 #line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp40_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 8148 "FacebookPublishing.c"
-		SoupMultipart* _tmp41_;
-		const gchar* _tmp42_;
+	if (spit_publishing_publishable_get_media_type (publishable) == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+#line 8560 "FacebookPublishing.c"
+		SoupMultipart* _tmp27_;
 #line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp41_ = mp_envelope;
+		_tmp27_ = mp_envelope;
 #line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp42_ = resource_privacy;
-#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		soup_multipart_append_form_string (_tmp41_, "privacy", _tmp42_);
-#line 8157 "FacebookPublishing.c"
+		soup_multipart_append_form_string (_tmp27_, "privacy", resource_privacy);
+#line 8566 "FacebookPublishing.c"
 	}
 #line 1104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp43_ = publishable;
-#line 1104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp44_ = spit_publishing_publishable_get_param_string (_tmp43_, "title");
+	_tmp28_ = spit_publishing_publishable_get_param_string (publishable, "title");
 #line 1104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishable_title = _tmp44_;
+	publishable_title = _tmp28_;
 #line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp46_ = suppress_titling;
+	if (!suppress_titling) {
+#line 8574 "FacebookPublishing.c"
+		const gchar* _tmp30_;
 #line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (!_tmp46_) {
-#line 8169 "FacebookPublishing.c"
-		const gchar* _tmp47_;
+		_tmp30_ = publishable_title;
 #line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp47_ = publishable_title;
-#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp45_ = _tmp47_ != NULL;
-#line 8175 "FacebookPublishing.c"
+		_tmp29_ = _tmp30_ != NULL;
+#line 8580 "FacebookPublishing.c"
 	} else {
 #line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp45_ = FALSE;
-#line 8179 "FacebookPublishing.c"
+		_tmp29_ = FALSE;
+#line 8584 "FacebookPublishing.c"
 	}
 #line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp45_) {
-#line 8183 "FacebookPublishing.c"
-		SoupMultipart* _tmp48_;
-		const gchar* _tmp49_;
+	if (_tmp29_) {
+#line 8588 "FacebookPublishing.c"
+		SoupMultipart* _tmp31_;
+		const gchar* _tmp32_;
 #line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp48_ = mp_envelope;
+		_tmp31_ = mp_envelope;
 #line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp49_ = publishable_title;
+		_tmp32_ = publishable_title;
 #line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		soup_multipart_append_form_string (_tmp48_, "name", _tmp49_);
-#line 8192 "FacebookPublishing.c"
+		soup_multipart_append_form_string (_tmp31_, "name", _tmp32_);
+#line 8597 "FacebookPublishing.c"
 	}
 #line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp50_ = publishable;
+	_tmp33_ = spit_publishing_publishable_get_param_string (publishable, "comment");
 #line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp51_ = spit_publishing_publishable_get_param_string (_tmp50_, "comment");
-#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishable_comment = _tmp51_;
-#line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp53_ = suppress_titling;
+	publishable_comment = _tmp33_;
 #line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (!_tmp53_) {
-#line 8204 "FacebookPublishing.c"
-		const gchar* _tmp54_;
+	if (!suppress_titling) {
+#line 8605 "FacebookPublishing.c"
+		const gchar* _tmp35_;
 #line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp54_ = publishable_comment;
+		_tmp35_ = publishable_comment;
 #line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp52_ = _tmp54_ != NULL;
-#line 8210 "FacebookPublishing.c"
+		_tmp34_ = _tmp35_ != NULL;
+#line 8611 "FacebookPublishing.c"
 	} else {
 #line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp52_ = FALSE;
-#line 8214 "FacebookPublishing.c"
+		_tmp34_ = FALSE;
+#line 8615 "FacebookPublishing.c"
 	}
 #line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp52_) {
-#line 8218 "FacebookPublishing.c"
-		SoupMultipart* _tmp55_;
-		const gchar* _tmp56_;
+	if (_tmp34_) {
+#line 8619 "FacebookPublishing.c"
+		SoupMultipart* _tmp36_;
+		const gchar* _tmp37_;
 #line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp55_ = mp_envelope;
+		_tmp36_ = mp_envelope;
 #line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp56_ = publishable_comment;
+		_tmp37_ = publishable_comment;
 #line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		soup_multipart_append_form_string (_tmp55_, "message", _tmp56_);
-#line 8227 "FacebookPublishing.c"
+		soup_multipart_append_form_string (_tmp36_, "message", _tmp37_);
+#line 8628 "FacebookPublishing.c"
 	}
 #line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp57_ = suppress_titling;
-#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (!_tmp57_) {
-#line 8233 "FacebookPublishing.c"
-		SoupMultipart* _tmp58_;
-		SpitPublishingPublishable* _tmp59_;
-		GDateTime* _tmp60_;
-		GDateTime* _tmp61_;
-		gchar* _tmp62_;
-		gchar* _tmp63_;
+	if (!suppress_titling) {
+#line 8632 "FacebookPublishing.c"
+		SoupMultipart* _tmp38_;
+		GDateTime* _tmp39_;
+		GDateTime* _tmp40_;
+		gchar* _tmp41_;
+		gchar* _tmp42_;
 #line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp58_ = mp_envelope;
+		_tmp38_ = mp_envelope;
 #line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp59_ = publishable;
+		_tmp39_ = spit_publishing_publishable_get_exposure_date_time (publishable);
 #line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp60_ = spit_publishing_publishable_get_exposure_date_time (_tmp59_);
+		_tmp40_ = _tmp39_;
 #line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp61_ = _tmp60_;
+		_tmp41_ = g_date_time_to_string (_tmp40_);
 #line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp62_ = g_date_time_to_string (_tmp61_);
+		_tmp42_ = _tmp41_;
 #line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp63_ = _tmp62_;
+		soup_multipart_append_form_string (_tmp38_, "backdated_time", _tmp42_);
 #line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		soup_multipart_append_form_string (_tmp58_, "backdated_time", _tmp63_);
+		_g_free0 (_tmp42_);
 #line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_g_free0 (_tmp63_);
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_g_date_time_unref0 (_tmp61_);
-#line 8258 "FacebookPublishing.c"
+		_g_date_time_unref0 (_tmp40_);
+#line 8654 "FacebookPublishing.c"
 	}
 #line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp65_ = publishable;
-#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp66_ = spit_publishing_publishable_get_media_type (_tmp65_);
-#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp66_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+	if (spit_publishing_publishable_get_media_type (publishable) == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
 #line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp64_ = "video";
-#line 8268 "FacebookPublishing.c"
+		_tmp43_ = "video";
+#line 8660 "FacebookPublishing.c"
 	} else {
 #line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp64_ = "image/jpeg";
-#line 8272 "FacebookPublishing.c"
+		_tmp43_ = "image/jpeg";
+#line 8664 "FacebookPublishing.c"
 	}
 #line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp67_ = g_strdup (_tmp64_);
+	_tmp44_ = g_strdup (_tmp43_);
 #line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	source_file_mime_type = _tmp67_;
+	source_file_mime_type = _tmp44_;
 #line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp68_ = mp_envelope;
+	_tmp45_ = mp_envelope;
 #line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp69_ = publishable;
+	_tmp46_ = spit_publishing_publishable_get_serialized_file (publishable);
 #line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp70_ = spit_publishing_publishable_get_serialized_file (_tmp69_);
+	_tmp47_ = _tmp46_;
 #line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp71_ = _tmp70_;
+	_tmp48_ = g_file_get_basename (_tmp47_);
 #line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp72_ = g_file_get_basename (_tmp71_);
+	_tmp49_ = _tmp48_;
 #line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp73_ = _tmp72_;
+	_tmp50_ = source_file_mime_type;
 #line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp74_ = source_file_mime_type;
+	_tmp51_ = image_data;
 #line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp75_ = image_data;
+	soup_multipart_append_form_file (_tmp45_, "source", _tmp49_, _tmp50_, _tmp51_);
 #line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	soup_multipart_append_form_file (_tmp68_, "source", _tmp73_, _tmp74_, _tmp75_);
+	_g_free0 (_tmp49_);
 #line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (_tmp73_);
-#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_object_unref0 (_tmp71_);
+	_g_object_unref0 (_tmp47_);
 #line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp76_ = mp_envelope;
+	_tmp52_ = mp_envelope;
 #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;
+	_tmp53_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message;
 #line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp78_ = _tmp77_->request_headers;
+	_tmp54_ = _tmp53_->request_headers;
 #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;
+	_tmp55_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message;
 #line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp80_ = _tmp79_->request_body;
+	_tmp56_ = _tmp55_->request_body;
 #line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	soup_multipart_to_message (_tmp76_, _tmp78_, _tmp80_);
+	soup_multipart_to_message (_tmp52_, _tmp54_, _tmp56_);
 #line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (source_file_mime_type);
 #line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -8340,18 +8730,27 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra
 	__vala_SoupBuffer_free0 (image_data);
 #line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 8324 "FacebookPublishing.c"
+#line 8714 "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) {
+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 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 8331 "FacebookPublishing.c"
+#line 8728 "FacebookPublishing.c"
 }
 
 
-static gboolean publishing_facebook_graph_session_graph_upload_message_real_prepare_for_transmission (PublishingFacebookGraphSessionGraphMessageImpl* base) {
+static gboolean
+publishing_facebook_graph_session_graph_upload_message_real_prepare_for_transmission (PublishingFacebookGraphSessionGraphMessageImpl* base)
+{
 	PublishingFacebookGraphSessionGraphUploadMessage * self;
 	gboolean result = FALSE;
 	GMappedFile* _tmp0_;
@@ -8361,7 +8760,7 @@ static gboolean publishing_facebook_graph_session_graph_upload_message_real_prep
 	_tmp0_ = self->priv->mapped_file;
 #line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 8345 "FacebookPublishing.c"
+#line 8744 "FacebookPublishing.c"
 		SpitPublishingPublishable* _tmp1_;
 		GFile* _tmp2_;
 		GFile* _tmp3_;
@@ -8403,18 +8802,20 @@ static gboolean publishing_facebook_graph_session_graph_upload_message_real_prep
 		result = FALSE;
 #line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return result;
-#line 8387 "FacebookPublishing.c"
+#line 8786 "FacebookPublishing.c"
 	} else {
 #line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		result = TRUE;
 #line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return result;
-#line 8393 "FacebookPublishing.c"
+#line 8792 "FacebookPublishing.c"
 	}
 }
 
 
-static void publishing_facebook_graph_session_graph_upload_message_class_init (PublishingFacebookGraphSessionGraphUploadMessageClass * klass) {
+static void
+publishing_facebook_graph_session_graph_upload_message_class_init (PublishingFacebookGraphSessionGraphUploadMessageClass * klass)
+{
 #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 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -8423,20 +8824,24 @@ static void publishing_facebook_graph_session_graph_upload_message_class_init (P
 	g_type_class_add_private (klass, sizeof (PublishingFacebookGraphSessionGraphUploadMessagePrivate));
 #line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookGraphSessionGraphMessageImplClass *) klass)->prepare_for_transmission = (gboolean (*) (PublishingFacebookGraphSessionGraphMessageImpl *)) publishing_facebook_graph_session_graph_upload_message_real_prepare_for_transmission;
-#line 8407 "FacebookPublishing.c"
+#line 8808 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_graph_session_graph_upload_message_instance_init (PublishingFacebookGraphSessionGraphUploadMessage * self) {
+static void
+publishing_facebook_graph_session_graph_upload_message_instance_init (PublishingFacebookGraphSessionGraphUploadMessage * self)
+{
 #line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv = PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_UPLOAD_MESSAGE_GET_PRIVATE (self);
 #line 1062 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->mapped_file = NULL;
-#line 8416 "FacebookPublishing.c"
+#line 8819 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_graph_session_graph_upload_message_finalize (PublishingFacebookGraphMessage * obj) {
+static void
+publishing_facebook_graph_session_graph_upload_message_finalize (PublishingFacebookGraphMessage * obj)
+{
 	PublishingFacebookGraphSessionGraphUploadMessage * self;
 #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);
@@ -8446,11 +8851,13 @@ static void publishing_facebook_graph_session_graph_upload_message_finalize (Pub
 	_g_object_unref0 (self->priv->publishable);
 #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 8430 "FacebookPublishing.c"
+#line 8835 "FacebookPublishing.c"
 }
 
 
-static GType publishing_facebook_graph_session_graph_upload_message_get_type (void) {
+static GType
+publishing_facebook_graph_session_graph_upload_message_get_type (void)
+{
 	static volatile gsize publishing_facebook_graph_session_graph_upload_message_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_facebook_graph_session_graph_upload_message_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingFacebookGraphSessionGraphUploadMessageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_facebook_graph_session_graph_upload_message_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFacebookGraphSessionGraphUploadMessage), 0, (GInstanceInitFunc) publishing_facebook_graph_session_graph_upload_message_instance_init, NULL };
@@ -8462,28 +8869,28 @@ static GType publishing_facebook_graph_session_graph_upload_message_get_type (vo
 }
 
 
-static PublishingFacebookGraphSessionGraphCreateAlbumMessage* publishing_facebook_graph_session_graph_create_album_message_construct (GType object_type, PublishingFacebookGraphSession* host_session, const gchar* access_token, const gchar* album_name, const gchar* album_privacy) {
+static PublishingFacebookGraphSessionGraphCreateAlbumMessage*
+publishing_facebook_graph_session_graph_create_album_message_construct (GType object_type,
+                                                                        PublishingFacebookGraphSession* host_session,
+                                                                        const gchar* access_token,
+                                                                        const gchar* album_name,
+                                                                        const gchar* album_privacy)
+{
 	PublishingFacebookGraphSessionGraphCreateAlbumMessage* self = NULL;
-	PublishingFacebookGraphSession* _tmp0_;
-	const gchar* _tmp1_;
-	gboolean _tmp2_ = FALSE;
-	const gchar* _tmp3_;
-	PublishingRESTSupportHttpMethod _tmp5_;
-	gchar* _tmp6_;
-	gchar* _tmp7_;
-	const gchar* _tmp8_;
-	SoupURI* _tmp9_;
-	SoupURI* _tmp10_;
-	SoupMessage* _tmp11_;
+	gboolean _tmp0_ = FALSE;
+	PublishingRESTSupportHttpMethod _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	const gchar* _tmp4_;
+	SoupURI* _tmp5_;
+	SoupURI* _tmp6_;
+	SoupMessage* _tmp7_;
 	SoupMultipart* mp_envelope = NULL;
-	SoupMultipart* _tmp12_;
-	const gchar* _tmp13_;
-	const gchar* _tmp14_;
-	const gchar* _tmp15_;
-	SoupMessage* _tmp16_;
-	SoupMessageHeaders* _tmp17_;
-	SoupMessage* _tmp18_;
-	SoupMessageBody* _tmp19_;
+	SoupMultipart* _tmp8_;
+	SoupMessage* _tmp9_;
+	SoupMessageHeaders* _tmp10_;
+	SoupMessage* _tmp11_;
+	SoupMessageBody* _tmp12_;
 #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 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -8493,104 +8900,99 @@ static PublishingFacebookGraphSessionGraphCreateAlbumMessage* publishing_faceboo
 #line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (album_privacy != NULL, NULL);
 #line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = host_session;
-#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = access_token;
-#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 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp3_ = album_privacy;
-#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp3_ != NULL) {
-#line 8486 "FacebookPublishing.c"
-		const gchar* _tmp4_;
+	self = (PublishingFacebookGraphSessionGraphCreateAlbumMessage*) publishing_facebook_graph_session_graph_message_impl_construct (object_type, host_session, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST, "/me/albums", access_token, PUBLISHING_FACEBOOK_ENDPOINT_DEFAULT);
 #line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp4_ = album_privacy;
+	if (album_privacy != NULL) {
 #line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp2_ = g_strcmp0 (_tmp4_, "") != 0;
-#line 8492 "FacebookPublishing.c"
+		_tmp0_ = g_strcmp0 (album_privacy, "") != 0;
+#line 8889 "FacebookPublishing.c"
 	} else {
 #line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp2_ = FALSE;
-#line 8496 "FacebookPublishing.c"
+		_tmp0_ = FALSE;
+#line 8893 "FacebookPublishing.c"
 	}
 #line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_vala_assert (_tmp2_, "album_privacy != null && album_privacy != \"\"");
+	_vala_assert (_tmp0_, "album_privacy != null && album_privacy != \"\"");
 #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;
+	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->method;
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp6_ = publishing_rest_support_http_method_to_string (_tmp5_);
+	_tmp2_ = publishing_rest_support_http_method_to_string (_tmp1_);
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp7_ = _tmp6_;
+	_tmp3_ = _tmp2_;
 #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;
+	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->uri;
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp9_ = soup_uri_new (_tmp8_);
+	_tmp5_ = soup_uri_new (_tmp4_);
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp10_ = _tmp9_;
+	_tmp6_ = _tmp5_;
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp11_ = soup_message_new_from_uri (_tmp7_, _tmp10_);
+	_tmp7_ = soup_message_new_from_uri (_tmp3_, _tmp6_);
 #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 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_;
+	G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message = _tmp7_;
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	__vala_SoupURI_free0 (_tmp10_);
+	__vala_SoupURI_free0 (_tmp6_);
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (_tmp7_);
+	_g_free0 (_tmp3_);
 #line 1146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp12_ = soup_multipart_new ("multipart/form-data");
+	_tmp8_ = soup_multipart_new ("multipart/form-data");
 #line 1146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	mp_envelope = _tmp12_;
+	mp_envelope = _tmp8_;
 #line 1148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp13_ = access_token;
-#line 1148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	soup_multipart_append_form_string (mp_envelope, "access_token", _tmp13_);
-#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp14_ = album_name;
+	soup_multipart_append_form_string (mp_envelope, "access_token", access_token);
 #line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	soup_multipart_append_form_string (mp_envelope, "name", _tmp14_);
-#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp15_ = album_privacy;
+	soup_multipart_append_form_string (mp_envelope, "name", album_name);
 #line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	soup_multipart_append_form_string (mp_envelope, "privacy", _tmp15_);
+	soup_multipart_append_form_string (mp_envelope, "privacy", album_privacy);
 #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;
+	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message;
 #line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp17_ = _tmp16_->request_headers;
+	_tmp10_ = _tmp9_->request_headers;
 #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;
+	_tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message;
 #line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp19_ = _tmp18_->request_body;
+	_tmp12_ = _tmp11_->request_body;
 #line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	soup_multipart_to_message (mp_envelope, _tmp17_, _tmp19_);
+	soup_multipart_to_message (mp_envelope, _tmp10_, _tmp12_);
 #line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	__vala_SoupMultipart_free0 (mp_envelope);
 #line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 8552 "FacebookPublishing.c"
+#line 8943 "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) {
+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 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 8559 "FacebookPublishing.c"
+#line 8955 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_graph_session_graph_create_album_message_class_init (PublishingFacebookGraphSessionGraphCreateAlbumMessageClass * klass) {
+static void
+publishing_facebook_graph_session_graph_create_album_message_class_init (PublishingFacebookGraphSessionGraphCreateAlbumMessageClass * klass)
+{
 #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 8566 "FacebookPublishing.c"
+#line 8964 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_graph_session_graph_create_album_message_instance_init (PublishingFacebookGraphSessionGraphCreateAlbumMessage * self) {
+static void
+publishing_facebook_graph_session_graph_create_album_message_instance_init (PublishingFacebookGraphSessionGraphCreateAlbumMessage * self)
+{
 }
 
 
-static GType publishing_facebook_graph_session_graph_create_album_message_get_type (void) {
+static GType
+publishing_facebook_graph_session_graph_create_album_message_get_type (void)
+{
 	static volatile gsize publishing_facebook_graph_session_graph_create_album_message_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_facebook_graph_session_graph_create_album_message_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingFacebookGraphSessionGraphCreateAlbumMessageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_facebook_graph_session_graph_create_album_message_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFacebookGraphSessionGraphCreateAlbumMessage), 0, (GInstanceInitFunc) publishing_facebook_graph_session_graph_create_album_message_instance_init, NULL };
@@ -8602,104 +9004,129 @@ static GType publishing_facebook_graph_session_graph_create_album_message_get_ty
 }
 
 
-static void publishing_facebook_value_graph_session_init (GValue* value) {
+static void
+publishing_facebook_value_graph_session_init (GValue* value)
+{
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 8589 "FacebookPublishing.c"
+#line 8993 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_value_graph_session_free_value (GValue* value) {
+static void
+publishing_facebook_value_graph_session_free_value (GValue* value)
+{
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (value->data[0].v_pointer) {
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_session_unref (value->data[0].v_pointer);
-#line 8598 "FacebookPublishing.c"
+#line 9004 "FacebookPublishing.c"
 	}
 }
 
 
-static void publishing_facebook_value_graph_session_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_facebook_value_graph_session_copy_value (const GValue* src_value,
+                                                    GValue* dest_value)
+{
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (src_value->data[0].v_pointer) {
 #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 8608 "FacebookPublishing.c"
+#line 9017 "FacebookPublishing.c"
 	} else {
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 8612 "FacebookPublishing.c"
+#line 9021 "FacebookPublishing.c"
 	}
 }
 
 
-static gpointer publishing_facebook_value_graph_session_peek_pointer (const GValue* value) {
+static gpointer
+publishing_facebook_value_graph_session_peek_pointer (const GValue* value)
+{
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 8620 "FacebookPublishing.c"
+#line 9031 "FacebookPublishing.c"
 }
 
 
-static gchar* publishing_facebook_value_graph_session_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_facebook_value_graph_session_collect_value (GValue* value,
+                                                       guint n_collect_values,
+                                                       GTypeCValue* collect_values,
+                                                       guint collect_flags)
+{
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 8627 "FacebookPublishing.c"
+#line 9043 "FacebookPublishing.c"
 		PublishingFacebookGraphSession * object;
 		object = collect_values[0].v_pointer;
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #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 8634 "FacebookPublishing.c"
+#line 9050 "FacebookPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #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 8638 "FacebookPublishing.c"
+#line 9054 "FacebookPublishing.c"
 		}
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = publishing_facebook_graph_session_ref (object);
-#line 8642 "FacebookPublishing.c"
+#line 9058 "FacebookPublishing.c"
 	} else {
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8646 "FacebookPublishing.c"
+#line 9062 "FacebookPublishing.c"
 	}
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 8650 "FacebookPublishing.c"
+#line 9066 "FacebookPublishing.c"
 }
 
 
-static gchar* publishing_facebook_value_graph_session_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+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 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!object_p) {
 #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 8661 "FacebookPublishing.c"
+#line 9082 "FacebookPublishing.c"
 	}
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = NULL;
-#line 8667 "FacebookPublishing.c"
+#line 9088 "FacebookPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 8671 "FacebookPublishing.c"
+#line 9092 "FacebookPublishing.c"
 	} else {
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = publishing_facebook_graph_session_ref (value->data[0].v_pointer);
-#line 8675 "FacebookPublishing.c"
+#line 9096 "FacebookPublishing.c"
 	}
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 8679 "FacebookPublishing.c"
+#line 9100 "FacebookPublishing.c"
 }
 
 
-GParamSpec* publishing_facebook_param_spec_graph_session (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_facebook_param_spec_graph_session (const gchar* name,
+                                              const gchar* nick,
+                                              const gchar* blurb,
+                                              GType object_type,
+                                              GParamFlags flags)
+{
 	PublishingFacebookParamSpecGraphSession* spec;
 #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);
@@ -8709,20 +9136,25 @@ GParamSpec* publishing_facebook_param_spec_graph_session (const gchar* name, con
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 8693 "FacebookPublishing.c"
+#line 9120 "FacebookPublishing.c"
 }
 
 
-gpointer publishing_facebook_value_get_graph_session (const GValue* value) {
+gpointer
+publishing_facebook_value_get_graph_session (const GValue* value)
+{
 #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 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 8702 "FacebookPublishing.c"
+#line 9131 "FacebookPublishing.c"
 }
 
 
-void publishing_facebook_value_set_graph_session (GValue* value, gpointer v_object) {
+void
+publishing_facebook_value_set_graph_session (GValue* value,
+                                             gpointer v_object)
+{
 	PublishingFacebookGraphSession * old;
 #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));
@@ -8738,22 +9170,25 @@ void publishing_facebook_value_set_graph_session (GValue* value, gpointer v_obje
 		value->data[0].v_pointer = v_object;
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_session_ref (value->data[0].v_pointer);
-#line 8722 "FacebookPublishing.c"
+#line 9154 "FacebookPublishing.c"
 	} else {
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8726 "FacebookPublishing.c"
+#line 9158 "FacebookPublishing.c"
 	}
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_session_unref (old);
-#line 8732 "FacebookPublishing.c"
+#line 9164 "FacebookPublishing.c"
 	}
 }
 
 
-void publishing_facebook_value_take_graph_session (GValue* value, gpointer v_object) {
+void
+publishing_facebook_value_take_graph_session (GValue* value,
+                                              gpointer v_object)
+{
 	PublishingFacebookGraphSession * old;
 #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));
@@ -8767,22 +9202,24 @@ void publishing_facebook_value_take_graph_session (GValue* value, gpointer v_obj
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 8751 "FacebookPublishing.c"
+#line 9186 "FacebookPublishing.c"
 	} else {
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8755 "FacebookPublishing.c"
+#line 9190 "FacebookPublishing.c"
 	}
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_session_unref (old);
-#line 8761 "FacebookPublishing.c"
+#line 9196 "FacebookPublishing.c"
 	}
 }
 
 
-static void publishing_facebook_graph_session_class_init (PublishingFacebookGraphSessionClass * klass) {
+static void
+publishing_facebook_graph_session_class_init (PublishingFacebookGraphSessionClass * klass)
+{
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_session_parent_class = g_type_class_peek_parent (klass);
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -8791,20 +9228,24 @@ static void publishing_facebook_graph_session_class_init (PublishingFacebookGrap
 	g_type_class_add_private (klass, sizeof (PublishingFacebookGraphSessionPrivate));
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_session_signals[PUBLISHING_FACEBOOK_GRAPH_SESSION_AUTHENTICATED_SIGNAL] = 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 8775 "FacebookPublishing.c"
+#line 9212 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_graph_session_instance_init (PublishingFacebookGraphSession * self) {
+static void
+publishing_facebook_graph_session_instance_init (PublishingFacebookGraphSession * self)
+{
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv = PUBLISHING_FACEBOOK_GRAPH_SESSION_GET_PRIVATE (self);
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->ref_count = 1;
-#line 8784 "FacebookPublishing.c"
+#line 9223 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_graph_session_finalize (PublishingFacebookGraphSession * obj) {
+static void
+publishing_facebook_graph_session_finalize (PublishingFacebookGraphSession * obj)
+{
 	PublishingFacebookGraphSession * self;
 	SoupSession* _tmp0_;
 	guint _tmp1_;
@@ -8824,11 +9265,13 @@ static void publishing_facebook_graph_session_finalize (PublishingFacebookGraphS
 	_g_free0 (self->priv->access_token);
 #line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (self->priv->current_message);
-#line 8808 "FacebookPublishing.c"
+#line 9249 "FacebookPublishing.c"
 }
 
 
-GType publishing_facebook_graph_session_get_type (void) {
+GType
+publishing_facebook_graph_session_get_type (void)
+{
 	static volatile gsize publishing_facebook_graph_session_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_facebook_graph_session_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { publishing_facebook_value_graph_session_init, publishing_facebook_value_graph_session_free_value, publishing_facebook_value_graph_session_copy_value, publishing_facebook_value_graph_session_peek_pointer, "p", publishing_facebook_value_graph_session_collect_value, "p", publishing_facebook_value_graph_session_lcopy_value };
@@ -8842,18 +9285,22 @@ GType publishing_facebook_graph_session_get_type (void) {
 }
 
 
-gpointer publishing_facebook_graph_session_ref (gpointer instance) {
+gpointer
+publishing_facebook_graph_session_ref (gpointer instance)
+{
 	PublishingFacebookGraphSession * self;
 	self = instance;
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return instance;
-#line 8833 "FacebookPublishing.c"
+#line 9278 "FacebookPublishing.c"
 }
 
 
-void publishing_facebook_graph_session_unref (gpointer instance) {
+void
+publishing_facebook_graph_session_unref (gpointer instance)
+{
 	PublishingFacebookGraphSession * self;
 	self = instance;
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -8862,56 +9309,65 @@ void publishing_facebook_graph_session_unref (gpointer instance) {
 		PUBLISHING_FACEBOOK_GRAPH_SESSION_GET_CLASS (self)->finalize (self);
 #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 8846 "FacebookPublishing.c"
+#line 9293 "FacebookPublishing.c"
 	}
 }
 
 
-static SpitPublishingPublishable** _vala_array_dup3 (SpitPublishingPublishable** self, int length) {
+static SpitPublishingPublishable**
+_vala_array_dup3 (SpitPublishingPublishable** self,
+                  int length)
+{
 	SpitPublishingPublishable** result;
 	int i;
 #line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = g_new0 (SpitPublishingPublishable*, length + 1);
 #line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 8858 "FacebookPublishing.c"
+#line 9308 "FacebookPublishing.c"
 		SpitPublishingPublishable* _tmp0_;
 #line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		result[i] = _tmp0_;
-#line 8864 "FacebookPublishing.c"
+#line 9314 "FacebookPublishing.c"
 	}
 #line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 8868 "FacebookPublishing.c"
+#line 9318 "FacebookPublishing.c"
 }
 
 
-static gpointer _publishing_facebook_graph_session_ref0 (gpointer self) {
+static gpointer
+_publishing_facebook_graph_session_ref0 (gpointer self)
+{
 #line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? publishing_facebook_graph_session_ref (self) : NULL;
-#line 8875 "FacebookPublishing.c"
+#line 9327 "FacebookPublishing.c"
 }
 
 
-static gpointer _publishing_facebook_publishing_parameters_ref0 (gpointer self) {
+static gpointer
+_publishing_facebook_publishing_parameters_ref0 (gpointer self)
+{
 #line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? publishing_facebook_publishing_parameters_ref (self) : NULL;
-#line 8882 "FacebookPublishing.c"
+#line 9336 "FacebookPublishing.c"
 }
 
 
-PublishingFacebookUploader* publishing_facebook_uploader_construct (GType object_type, 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)
+{
 	PublishingFacebookUploader* self = NULL;
 	SpitPublishingPublishable** _tmp0_;
 	gint _tmp0__length1;
-	SpitPublishingPublishable** _tmp1_;
-	gint _tmp1__length1;
-	PublishingFacebookGraphSession* _tmp2_;
-	PublishingFacebookGraphSession* _tmp3_;
-	PublishingFacebookPublishingParameters* _tmp4_;
-	PublishingFacebookPublishingParameters* _tmp5_;
+	PublishingFacebookGraphSession* _tmp1_;
+	PublishingFacebookPublishingParameters* _tmp2_;
 #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (session), NULL);
 #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -8921,72 +9377,83 @@ PublishingFacebookUploader* publishing_facebook_uploader_construct (GType object
 #line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->current_file = 0;
 #line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = publishables;
+	_tmp0_ = (publishables != NULL) ? _vala_array_dup3 (publishables, publishables_length1) : ((gpointer) publishables);
 #line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0__length1 = publishables_length1;
 #line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup3 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
-#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1__length1 = _tmp0__length1;
-#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 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->publishables = _tmp1_;
+	self->priv->publishables = _tmp0_;
 #line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->publishables_length1 = _tmp1__length1;
+	self->priv->publishables_length1 = _tmp0__length1;
 #line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->_publishables_size_ = self->priv->publishables_length1;
 #line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = session;
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp3_ = _publishing_facebook_graph_session_ref0 (_tmp2_);
+	_tmp1_ = _publishing_facebook_graph_session_ref0 (session);
 #line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_session_unref0 (self->priv->session);
 #line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->session = _tmp3_;
-#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp4_ = publishing_params;
+	self->priv->session = _tmp1_;
 #line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = _publishing_facebook_publishing_parameters_ref0 (_tmp4_);
+	_tmp2_ = _publishing_facebook_publishing_parameters_ref0 (publishing_params);
 #line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_publishing_parameters_unref0 (self->priv->publishing_params);
 #line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->publishing_params = _tmp5_;
+	self->priv->publishing_params = _tmp2_;
 #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 8938 "FacebookPublishing.c"
+#line 9386 "FacebookPublishing.c"
 }
 
 
-PublishingFacebookUploader* publishing_facebook_uploader_new (PublishingFacebookGraphSession* session, PublishingFacebookPublishingParameters* publishing_params, SpitPublishingPublishable** publishables, int publishables_length1) {
+PublishingFacebookUploader*
+publishing_facebook_uploader_new (PublishingFacebookGraphSession* session,
+                                  PublishingFacebookPublishingParameters* publishing_params,
+                                  SpitPublishingPublishable** publishables,
+                                  int publishables_length1)
+{
 #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 8945 "FacebookPublishing.c"
+#line 9398 "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) {
+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 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 8952 "FacebookPublishing.c"
+#line 9410 "FacebookPublishing.c"
 }
 
 
-static void _publishing_facebook_uploader_on_message_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender, gpointer self) {
+static void
+_publishing_facebook_uploader_on_message_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender,
+                                                                                                gpointer self)
+{
 #line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_uploader_on_message_completed ((PublishingFacebookUploader*) self, _sender);
-#line 8959 "FacebookPublishing.c"
+#line 9420 "FacebookPublishing.c"
 }
 
 
-static void _publishing_facebook_uploader_on_message_failed_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender, GError* err, gpointer self) {
+static void
+_publishing_facebook_uploader_on_message_failed_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender,
+                                                                                          GError* err,
+                                                                                          gpointer self)
+{
 #line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_uploader_on_message_failed ((PublishingFacebookUploader*) self, _sender, err);
-#line 8966 "FacebookPublishing.c"
+#line 9431 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_uploader_send_current_file (PublishingFacebookUploader* self) {
+static void
+publishing_facebook_uploader_send_current_file (PublishingFacebookUploader* self)
+{
 	SpitPublishingPublishable* publishable = NULL;
 	SpitPublishingPublishable** _tmp0_;
 	gint _tmp0__length1;
@@ -8999,27 +9466,25 @@ static void publishing_facebook_uploader_send_current_file (PublishingFacebookUp
 	GFile* _tmp6_;
 	gchar* _tmp8_ = NULL;
 	SpitPublishingPublishable* _tmp9_;
-	SpitPublishingPublisherMediaType _tmp10_;
 	gchar* resource_uri = NULL;
-	gchar* _tmp16_;
-	const gchar* _tmp17_ = NULL;
-	SpitPublishingPublishable* _tmp18_;
-	SpitPublishingPublisherMediaType _tmp19_;
+	gchar* _tmp15_;
+	const gchar* _tmp16_ = NULL;
+	SpitPublishingPublishable* _tmp17_;
 	gchar* resource_privacy = NULL;
-	gchar* _tmp22_;
+	gchar* _tmp20_;
 	PublishingFacebookGraphMessage* upload_message = NULL;
-	PublishingFacebookGraphSession* _tmp23_;
-	const gchar* _tmp24_;
-	SpitPublishingPublishable* _tmp25_;
-	PublishingFacebookPublishingParameters* _tmp26_;
-	gboolean _tmp27_;
-	const gchar* _tmp28_;
+	PublishingFacebookGraphSession* _tmp21_;
+	const gchar* _tmp22_;
+	SpitPublishingPublishable* _tmp23_;
+	PublishingFacebookPublishingParameters* _tmp24_;
+	gboolean _tmp25_;
+	const gchar* _tmp26_;
+	PublishingFacebookGraphMessage* _tmp27_;
+	PublishingFacebookGraphMessage* _tmp28_;
 	PublishingFacebookGraphMessage* _tmp29_;
 	PublishingFacebookGraphMessage* _tmp30_;
-	PublishingFacebookGraphMessage* _tmp31_;
+	PublishingFacebookGraphSession* _tmp31_;
 	PublishingFacebookGraphMessage* _tmp32_;
-	PublishingFacebookGraphSession* _tmp33_;
-	PublishingFacebookGraphMessage* _tmp34_;
 #line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (self));
 #line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -9044,7 +9509,7 @@ static void publishing_facebook_uploader_send_current_file (PublishingFacebookUp
 	_tmp6_ = file;
 #line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp6_ == NULL) {
-#line 9028 "FacebookPublishing.c"
+#line 9493 "FacebookPublishing.c"
 		gint _tmp7_;
 #line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp7_ = self->priv->current_file;
@@ -9056,107 +9521,103 @@ static void publishing_facebook_uploader_send_current_file (PublishingFacebookUp
 		_g_object_unref0 (publishable);
 #line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 9040 "FacebookPublishing.c"
+#line 9505 "FacebookPublishing.c"
 	}
 #line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp9_ = publishable;
 #line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp10_ = spit_publishing_publishable_get_media_type (_tmp9_);
-#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp10_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
-#line 9048 "FacebookPublishing.c"
-		PublishingFacebookPublishingParameters* _tmp11_;
+	if (spit_publishing_publishable_get_media_type (_tmp9_) == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
+#line 9511 "FacebookPublishing.c"
+		PublishingFacebookPublishingParameters* _tmp10_;
+		gchar* _tmp11_;
 		gchar* _tmp12_;
 		gchar* _tmp13_;
-		gchar* _tmp14_;
 #line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp11_ = self->priv->publishing_params;
+		_tmp10_ = self->priv->publishing_params;
 #line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp12_ = publishing_facebook_publishing_parameters_get_target_album_id (_tmp11_);
+		_tmp11_ = publishing_facebook_publishing_parameters_get_target_album_id (_tmp10_);
 #line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp13_ = _tmp12_;
+		_tmp12_ = _tmp11_;
 #line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp14_ = g_strdup_printf ("/%s/photos", _tmp13_);
+		_tmp13_ = g_strdup_printf ("/%s/photos", _tmp12_);
 #line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp8_);
 #line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp8_ = _tmp14_;
+		_tmp8_ = _tmp13_;
 #line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_g_free0 (_tmp13_);
-#line 9067 "FacebookPublishing.c"
+		_g_free0 (_tmp12_);
+#line 9530 "FacebookPublishing.c"
 	} else {
-		gchar* _tmp15_;
+		gchar* _tmp14_;
 #line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp15_ = g_strdup ("/me/videos");
+		_tmp14_ = g_strdup ("/me/videos");
 #line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp8_);
 #line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp8_ = _tmp15_;
-#line 9076 "FacebookPublishing.c"
+		_tmp8_ = _tmp14_;
+#line 9539 "FacebookPublishing.c"
 	}
 #line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp16_ = g_strdup (_tmp8_);
+	_tmp15_ = g_strdup (_tmp8_);
 #line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	resource_uri = _tmp16_;
-#line 1335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp18_ = publishable;
+	resource_uri = _tmp15_;
 #line 1335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp19_ = spit_publishing_publishable_get_media_type (_tmp18_);
+	_tmp17_ = publishable;
 #line 1335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp19_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 9088 "FacebookPublishing.c"
-		PublishingFacebookPublishingParameters* _tmp20_;
-		const gchar* _tmp21_;
+	if (spit_publishing_publishable_get_media_type (_tmp17_) == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+#line 9549 "FacebookPublishing.c"
+		PublishingFacebookPublishingParameters* _tmp18_;
+		const gchar* _tmp19_;
 #line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp20_ = self->priv->publishing_params;
+		_tmp18_ = self->priv->publishing_params;
 #line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp21_ = _tmp20_->privacy_object;
+		_tmp19_ = _tmp18_->privacy_object;
 #line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp17_ = _tmp21_;
-#line 9097 "FacebookPublishing.c"
+		_tmp16_ = _tmp19_;
+#line 9558 "FacebookPublishing.c"
 	} else {
 #line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp17_ = NULL;
-#line 9101 "FacebookPublishing.c"
+		_tmp16_ = NULL;
+#line 9562 "FacebookPublishing.c"
 	}
 #line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp22_ = g_strdup (_tmp17_);
+	_tmp20_ = g_strdup (_tmp16_);
 #line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	resource_privacy = _tmp22_;
+	resource_privacy = _tmp20_;
 #line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp23_ = self->priv->session;
+	_tmp21_ = self->priv->session;
 #line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp24_ = resource_uri;
+	_tmp22_ = resource_uri;
 #line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp25_ = publishable;
+	_tmp23_ = publishable;
 #line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp26_ = self->priv->publishing_params;
+	_tmp24_ = self->priv->publishing_params;
 #line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp27_ = _tmp26_->strip_metadata;
+	_tmp25_ = _tmp24_->strip_metadata;
 #line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp28_ = resource_privacy;
+	_tmp26_ = resource_privacy;
 #line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp29_ = publishing_facebook_graph_session_new_upload (_tmp23_, _tmp24_, _tmp25_, _tmp27_, _tmp28_);
+	_tmp27_ = publishing_facebook_graph_session_new_upload (_tmp21_, _tmp22_, _tmp23_, _tmp25_, _tmp26_);
 #line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	upload_message = _tmp29_;
+	upload_message = _tmp27_;
 #line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp30_ = upload_message;
+	_tmp28_ = upload_message;
 #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);
+	g_signal_connect (_tmp28_, "data-transmitted", (GCallback) _publishing_facebook_uploader_on_chunk_transmitted_publishing_facebook_graph_message_data_transmitted, self);
 #line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp31_ = upload_message;
+	_tmp29_ = upload_message;
 #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);
+	g_signal_connect (_tmp29_, "completed", (GCallback) _publishing_facebook_uploader_on_message_completed_publishing_facebook_graph_message_completed, self);
 #line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp32_ = upload_message;
+	_tmp30_ = upload_message;
 #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);
+	g_signal_connect (_tmp30_, "failed", (GCallback) _publishing_facebook_uploader_on_message_failed_publishing_facebook_graph_message_failed, self);
 #line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp33_ = self->priv->session;
+	_tmp31_ = self->priv->session;
 #line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp34_ = upload_message;
+	_tmp32_ = upload_message;
 #line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishing_facebook_graph_session_send_message (_tmp33_, _tmp34_);
+	publishing_facebook_graph_session_send_message (_tmp31_, _tmp32_);
 #line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (upload_message);
 #line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -9169,35 +9630,39 @@ static void publishing_facebook_uploader_send_current_file (PublishingFacebookUp
 	_g_object_unref0 (file);
 #line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (publishable);
-#line 9153 "FacebookPublishing.c"
+#line 9614 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_uploader_send_files (PublishingFacebookUploader* self) {
+static void
+publishing_facebook_uploader_send_files (PublishingFacebookUploader* self)
+{
 #line 1347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (self));
 #line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->current_file = 0;
 #line 1349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_uploader_send_current_file (self);
-#line 9164 "FacebookPublishing.c"
+#line 9627 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_uploader_on_chunk_transmitted (PublishingFacebookUploader* self, gint bytes_written_so_far, gint total_bytes) {
+static void
+publishing_facebook_uploader_on_chunk_transmitted (PublishingFacebookUploader* self,
+                                                   gint bytes_written_so_far,
+                                                   gint total_bytes)
+{
 	gdouble file_span = 0.0;
 	SpitPublishingPublishable** _tmp0_;
 	gint _tmp0__length1;
 	gdouble this_file_fraction_complete = 0.0;
-	gint _tmp1_;
-	gint _tmp2_;
 	gdouble fraction_complete = 0.0;
-	gint _tmp3_;
+	gint _tmp1_;
+	gdouble _tmp2_;
+	gdouble _tmp3_;
 	gdouble _tmp4_;
-	gdouble _tmp5_;
-	gdouble _tmp6_;
-	SpitPublishingProgressCallback _tmp7_;
-	void* _tmp7__target;
+	SpitPublishingProgressCallback _tmp5_;
+	void* _tmp5__target;
 #line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (self));
 #line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -9207,270 +9672,275 @@ static void publishing_facebook_uploader_on_chunk_transmitted (PublishingFaceboo
 #line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	file_span = 1.0 / _tmp0__length1;
 #line 1354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = bytes_written_so_far;
-#line 1354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = total_bytes;
-#line 1354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	this_file_fraction_complete = ((gdouble) _tmp1_) / _tmp2_;
+	this_file_fraction_complete = ((gdouble) bytes_written_so_far) / total_bytes;
 #line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp3_ = self->priv->current_file;
+	_tmp1_ = self->priv->current_file;
 #line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp4_ = file_span;
+	_tmp2_ = file_span;
 #line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = this_file_fraction_complete;
+	_tmp3_ = this_file_fraction_complete;
 #line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp6_ = file_span;
+	_tmp4_ = file_span;
 #line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	fraction_complete = (_tmp3_ * _tmp4_) + (_tmp5_ * _tmp6_);
+	fraction_complete = (_tmp1_ * _tmp2_) + (_tmp3_ * _tmp4_);
 #line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp7_ = self->priv->status_updated;
+	_tmp5_ = self->priv->status_updated;
 #line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp7__target = self->priv->status_updated_target;
+	_tmp5__target = self->priv->status_updated_target;
 #line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp7_ != NULL) {
-#line 9212 "FacebookPublishing.c"
-		SpitPublishingProgressCallback _tmp8_;
-		void* _tmp8__target;
-		gint _tmp9_;
-		gdouble _tmp10_;
+	if (_tmp5_ != NULL) {
+#line 9673 "FacebookPublishing.c"
+		SpitPublishingProgressCallback _tmp6_;
+		void* _tmp6__target;
+		gint _tmp7_;
+		gdouble _tmp8_;
 #line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp8_ = self->priv->status_updated;
+		_tmp6_ = self->priv->status_updated;
 #line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp8__target = self->priv->status_updated_target;
+		_tmp6__target = self->priv->status_updated_target;
 #line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp9_ = self->priv->current_file;
+		_tmp7_ = self->priv->current_file;
 #line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp10_ = fraction_complete;
+		_tmp8_ = fraction_complete;
 #line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp8_ (_tmp9_ + 1, _tmp10_, _tmp8__target);
-#line 9227 "FacebookPublishing.c"
+		_tmp6_ (_tmp7_ + 1, _tmp8_, _tmp6__target);
+#line 9688 "FacebookPublishing.c"
 	}
 }
 
 
-static void publishing_facebook_uploader_on_message_completed (PublishingFacebookUploader* self, PublishingFacebookGraphMessage* message) {
-	PublishingFacebookGraphMessage* _tmp0_;
+static void
+publishing_facebook_uploader_on_message_completed (PublishingFacebookUploader* self,
+                                                   PublishingFacebookGraphMessage* message)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingFacebookGraphMessage* _tmp2_;
-	guint _tmp3_;
-	PublishingFacebookGraphMessage* _tmp4_;
-	guint _tmp5_;
-	gint _tmp6_;
-	gint _tmp7_;
-	SpitPublishingPublishable** _tmp8_;
-	gint _tmp8__length1;
+	guint _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	SpitPublishingPublishable** _tmp5_;
+	gint _tmp5__length1;
 #line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (self));
 #line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
 #line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = message;
+	g_signal_parse_name ("data-transmitted", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp0_, NULL, FALSE);
 #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 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 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = message;
+	g_signal_handlers_disconnect_matched (message, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_facebook_uploader_on_chunk_transmitted_publishing_facebook_graph_message_data_transmitted, self);
 #line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp3_, NULL, FALSE);
+	g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
 #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);
+	g_signal_handlers_disconnect_matched (message, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_uploader_on_message_completed_publishing_facebook_graph_message_completed, self);
 #line 1365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp4_ = message;
+	g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp2_, NULL, FALSE);
 #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 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);
+	g_signal_handlers_disconnect_matched (message, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _publishing_facebook_uploader_on_message_failed_publishing_facebook_graph_message_failed, self);
 #line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp6_ = self->priv->current_file;
+	_tmp3_ = self->priv->current_file;
 #line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->current_file = _tmp6_ + 1;
+	self->priv->current_file = _tmp3_ + 1;
 #line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp7_ = self->priv->current_file;
+	_tmp4_ = self->priv->current_file;
 #line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp8_ = self->priv->publishables;
+	_tmp5_ = self->priv->publishables;
 #line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp8__length1 = self->priv->publishables_length1;
+	_tmp5__length1 = self->priv->publishables_length1;
 #line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp7_ < _tmp8__length1) {
+	if (_tmp4_ < _tmp5__length1) {
 #line 1369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_uploader_send_current_file (self);
-#line 9279 "FacebookPublishing.c"
+#line 9734 "FacebookPublishing.c"
 	} else {
-		gint _tmp9_;
+		gint _tmp6_;
 #line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp9_ = self->priv->current_file;
+		_tmp6_ = self->priv->current_file;
 #line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		g_signal_emit (self, publishing_facebook_uploader_signals[PUBLISHING_FACEBOOK_UPLOADER_UPLOAD_COMPLETE_SIGNAL], 0, _tmp9_);
-#line 9286 "FacebookPublishing.c"
+		g_signal_emit (self, publishing_facebook_uploader_signals[PUBLISHING_FACEBOOK_UPLOADER_UPLOAD_COMPLETE_SIGNAL], 0, _tmp6_);
+#line 9741 "FacebookPublishing.c"
 	}
 }
 
 
-static void publishing_facebook_uploader_on_message_failed (PublishingFacebookUploader* self, PublishingFacebookGraphMessage* message, GError* _error_) {
-	PublishingFacebookGraphMessage* _tmp0_;
+static void
+publishing_facebook_uploader_on_message_failed (PublishingFacebookUploader* self,
+                                                PublishingFacebookGraphMessage* message,
+                                                GError* _error_)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingFacebookGraphMessage* _tmp2_;
-	guint _tmp3_;
-	PublishingFacebookGraphMessage* _tmp4_;
-	guint _tmp5_;
-	GError* _tmp6_;
+	guint _tmp2_;
 #line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (self));
 #line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
 #line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = message;
-#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);
+	g_signal_parse_name ("data-transmitted", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp0_, NULL, FALSE);
 #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);
+	g_signal_handlers_disconnect_matched (message, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_facebook_uploader_on_chunk_transmitted_publishing_facebook_graph_message_data_transmitted, self);
 #line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = message;
-#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp3_, NULL, FALSE);
+	g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
 #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 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp4_ = message;
+	g_signal_handlers_disconnect_matched (message, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_uploader_on_message_completed_publishing_facebook_graph_message_completed, self);
 #line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp5_, NULL, FALSE);
+	g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp2_, NULL, FALSE);
 #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);
+	g_signal_handlers_disconnect_matched (message, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _publishing_facebook_uploader_on_message_failed_publishing_facebook_graph_message_failed, self);
 #line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp6_ = _error_;
-#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_emit (self, publishing_facebook_uploader_signals[PUBLISHING_FACEBOOK_UPLOADER_UPLOAD_ERROR_SIGNAL], 0, _tmp6_);
-#line 9325 "FacebookPublishing.c"
+	g_signal_emit (self, publishing_facebook_uploader_signals[PUBLISHING_FACEBOOK_UPLOADER_UPLOAD_ERROR_SIGNAL], 0, _error_);
+#line 9772 "FacebookPublishing.c"
 }
 
 
-void publishing_facebook_uploader_upload (PublishingFacebookUploader* self, SpitPublishingProgressCallback status_updated, void* status_updated_target) {
-	SpitPublishingProgressCallback _tmp0_;
-	void* _tmp0__target;
-	SpitPublishingPublishable** _tmp1_;
-	gint _tmp1__length1;
+void
+publishing_facebook_uploader_upload (PublishingFacebookUploader* self,
+                                     SpitPublishingProgressCallback status_updated,
+                                     void* status_updated_target)
+{
+	SpitPublishingPublishable** _tmp0_;
+	gint _tmp0__length1;
 #line 1383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (self));
 #line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = status_updated;
+	self->priv->status_updated = status_updated;
 #line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0__target = status_updated_target;
-#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->status_updated = _tmp0_;
-#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->status_updated_target = _tmp0__target;
+	self->priv->status_updated_target = status_updated_target;
 #line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = self->priv->publishables;
+	_tmp0_ = self->priv->publishables;
 #line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1__length1 = self->priv->publishables_length1;
+	_tmp0__length1 = self->priv->publishables_length1;
 #line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp1__length1 > 0) {
+	if (_tmp0__length1 > 0) {
 #line 1387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_uploader_send_files (self);
-#line 9352 "FacebookPublishing.c"
+#line 9797 "FacebookPublishing.c"
 	}
 }
 
 
-static void publishing_facebook_value_uploader_init (GValue* value) {
+static void
+publishing_facebook_value_uploader_init (GValue* value)
+{
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 9360 "FacebookPublishing.c"
+#line 9807 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_value_uploader_free_value (GValue* value) {
+static void
+publishing_facebook_value_uploader_free_value (GValue* value)
+{
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (value->data[0].v_pointer) {
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_uploader_unref (value->data[0].v_pointer);
-#line 9369 "FacebookPublishing.c"
+#line 9818 "FacebookPublishing.c"
 	}
 }
 
 
-static void publishing_facebook_value_uploader_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_facebook_value_uploader_copy_value (const GValue* src_value,
+                                               GValue* dest_value)
+{
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (src_value->data[0].v_pointer) {
 #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 9379 "FacebookPublishing.c"
+#line 9831 "FacebookPublishing.c"
 	} else {
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 9383 "FacebookPublishing.c"
+#line 9835 "FacebookPublishing.c"
 	}
 }
 
 
-static gpointer publishing_facebook_value_uploader_peek_pointer (const GValue* value) {
+static gpointer
+publishing_facebook_value_uploader_peek_pointer (const GValue* value)
+{
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 9391 "FacebookPublishing.c"
+#line 9845 "FacebookPublishing.c"
 }
 
 
-static gchar* publishing_facebook_value_uploader_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_facebook_value_uploader_collect_value (GValue* value,
+                                                  guint n_collect_values,
+                                                  GTypeCValue* collect_values,
+                                                  guint collect_flags)
+{
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 9398 "FacebookPublishing.c"
+#line 9857 "FacebookPublishing.c"
 		PublishingFacebookUploader * object;
 		object = collect_values[0].v_pointer;
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #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 9405 "FacebookPublishing.c"
+#line 9864 "FacebookPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #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 9409 "FacebookPublishing.c"
+#line 9868 "FacebookPublishing.c"
 		}
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = publishing_facebook_uploader_ref (object);
-#line 9413 "FacebookPublishing.c"
+#line 9872 "FacebookPublishing.c"
 	} else {
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 9417 "FacebookPublishing.c"
+#line 9876 "FacebookPublishing.c"
 	}
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 9421 "FacebookPublishing.c"
+#line 9880 "FacebookPublishing.c"
 }
 
 
-static gchar* publishing_facebook_value_uploader_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+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 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!object_p) {
 #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 9432 "FacebookPublishing.c"
+#line 9896 "FacebookPublishing.c"
 	}
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = NULL;
-#line 9438 "FacebookPublishing.c"
+#line 9902 "FacebookPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 9442 "FacebookPublishing.c"
+#line 9906 "FacebookPublishing.c"
 	} else {
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = publishing_facebook_uploader_ref (value->data[0].v_pointer);
-#line 9446 "FacebookPublishing.c"
+#line 9910 "FacebookPublishing.c"
 	}
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 9450 "FacebookPublishing.c"
+#line 9914 "FacebookPublishing.c"
 }
 
 
-GParamSpec* publishing_facebook_param_spec_uploader (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_facebook_param_spec_uploader (const gchar* name,
+                                         const gchar* nick,
+                                         const gchar* blurb,
+                                         GType object_type,
+                                         GParamFlags flags)
+{
 	PublishingFacebookParamSpecUploader* spec;
 #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);
@@ -9480,20 +9950,25 @@ GParamSpec* publishing_facebook_param_spec_uploader (const gchar* name, const gc
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 9464 "FacebookPublishing.c"
+#line 9934 "FacebookPublishing.c"
 }
 
 
-gpointer publishing_facebook_value_get_uploader (const GValue* value) {
+gpointer
+publishing_facebook_value_get_uploader (const GValue* value)
+{
 #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 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 9473 "FacebookPublishing.c"
+#line 9945 "FacebookPublishing.c"
 }
 
 
-void publishing_facebook_value_set_uploader (GValue* value, gpointer v_object) {
+void
+publishing_facebook_value_set_uploader (GValue* value,
+                                        gpointer v_object)
+{
 	PublishingFacebookUploader * old;
 #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));
@@ -9509,22 +9984,25 @@ void publishing_facebook_value_set_uploader (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_uploader_ref (value->data[0].v_pointer);
-#line 9493 "FacebookPublishing.c"
+#line 9968 "FacebookPublishing.c"
 	} else {
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 9497 "FacebookPublishing.c"
+#line 9972 "FacebookPublishing.c"
 	}
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_uploader_unref (old);
-#line 9503 "FacebookPublishing.c"
+#line 9978 "FacebookPublishing.c"
 	}
 }
 
 
-void publishing_facebook_value_take_uploader (GValue* value, gpointer v_object) {
+void
+publishing_facebook_value_take_uploader (GValue* value,
+                                         gpointer v_object)
+{
 	PublishingFacebookUploader * old;
 #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));
@@ -9538,22 +10016,24 @@ void publishing_facebook_value_take_uploader (GValue* value, gpointer v_object)
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 9522 "FacebookPublishing.c"
+#line 10000 "FacebookPublishing.c"
 	} else {
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 9526 "FacebookPublishing.c"
+#line 10004 "FacebookPublishing.c"
 	}
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_uploader_unref (old);
-#line 9532 "FacebookPublishing.c"
+#line 10010 "FacebookPublishing.c"
 	}
 }
 
 
-static void publishing_facebook_uploader_class_init (PublishingFacebookUploaderClass * klass) {
+static void
+publishing_facebook_uploader_class_init (PublishingFacebookUploaderClass * klass)
+{
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_uploader_parent_class = g_type_class_peek_parent (klass);
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -9564,11 +10044,13 @@ static void publishing_facebook_uploader_class_init (PublishingFacebookUploaderC
 	publishing_facebook_uploader_signals[PUBLISHING_FACEBOOK_UPLOADER_UPLOAD_COMPLETE_SIGNAL] = 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 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_uploader_signals[PUBLISHING_FACEBOOK_UPLOADER_UPLOAD_ERROR_SIGNAL] = 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 9548 "FacebookPublishing.c"
+#line 10028 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_uploader_instance_init (PublishingFacebookUploader * self) {
+static void
+publishing_facebook_uploader_instance_init (PublishingFacebookUploader * self)
+{
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv = PUBLISHING_FACEBOOK_UPLOADER_GET_PRIVATE (self);
 #line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -9577,11 +10059,13 @@ static void publishing_facebook_uploader_instance_init (PublishingFacebookUpload
 	self->priv->status_updated_target = self;
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->ref_count = 1;
-#line 9561 "FacebookPublishing.c"
+#line 10043 "FacebookPublishing.c"
 }
 
 
-static void publishing_facebook_uploader_finalize (PublishingFacebookUploader * obj) {
+static void
+publishing_facebook_uploader_finalize (PublishingFacebookUploader * obj)
+{
 	PublishingFacebookUploader * self;
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_UPLOADER, PublishingFacebookUploader);
@@ -9593,11 +10077,13 @@ static void publishing_facebook_uploader_finalize (PublishingFacebookUploader *
 	_publishing_facebook_graph_session_unref0 (self->priv->session);
 #line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_publishing_parameters_unref0 (self->priv->publishing_params);
-#line 9577 "FacebookPublishing.c"
+#line 10061 "FacebookPublishing.c"
 }
 
 
-GType publishing_facebook_uploader_get_type (void) {
+GType
+publishing_facebook_uploader_get_type (void)
+{
 	static volatile gsize publishing_facebook_uploader_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_facebook_uploader_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { publishing_facebook_value_uploader_init, publishing_facebook_value_uploader_free_value, publishing_facebook_value_uploader_copy_value, publishing_facebook_value_uploader_peek_pointer, "p", publishing_facebook_value_uploader_collect_value, "p", publishing_facebook_value_uploader_lcopy_value };
@@ -9611,18 +10097,22 @@ GType publishing_facebook_uploader_get_type (void) {
 }
 
 
-gpointer publishing_facebook_uploader_ref (gpointer instance) {
+gpointer
+publishing_facebook_uploader_ref (gpointer instance)
+{
 	PublishingFacebookUploader * self;
 	self = instance;
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return instance;
-#line 9602 "FacebookPublishing.c"
+#line 10090 "FacebookPublishing.c"
 }
 
 
-void publishing_facebook_uploader_unref (gpointer instance) {
+void
+publishing_facebook_uploader_unref (gpointer instance)
+{
 	PublishingFacebookUploader * self;
 	self = instance;
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -9631,12 +10121,16 @@ void publishing_facebook_uploader_unref (gpointer instance) {
 		PUBLISHING_FACEBOOK_UPLOADER_GET_CLASS (self)->finalize (self);
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 9615 "FacebookPublishing.c"
+#line 10105 "FacebookPublishing.c"
 	}
 }
 
 
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_destroy (gpointer array,
+                     gint array_length,
+                     GDestroyNotify destroy_func)
+{
 	if ((array != NULL) && (destroy_func != NULL)) {
 		int i;
 		for (i = 0; i < array_length; i = i + 1) {
@@ -9648,7 +10142,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti
 }
 
 
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_free (gpointer array,
+                  gint array_length,
+                  GDestroyNotify destroy_func)
+{
 	_vala_array_destroy (array, array_length, destroy_func);
 	g_free (array);
 }
diff --git a/plugins/shotwell-publishing/FlickrPublishing.c b/plugins/shotwell-publishing/FlickrPublishing.c
index 25f2d69..1601192 100644
--- a/plugins/shotwell-publishing/FlickrPublishing.c
+++ b/plugins/shotwell-publishing/FlickrPublishing.c
@@ -1,4 +1,4 @@
-/* FlickrPublishing.c generated by valac 0.36.6, the Vala compiler
+/* FlickrPublishing.c generated by valac 0.40.4, the Vala compiler
  * generated from FlickrPublishing.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <shotwell-plugin-dev-1.0.h>
@@ -37,6 +38,11 @@
 typedef struct _FlickrService FlickrService;
 typedef struct _FlickrServiceClass FlickrServiceClass;
 typedef struct _FlickrServicePrivate FlickrServicePrivate;
+enum  {
+	FLICKR_SERVICE_0_PROPERTY,
+	FLICKR_SERVICE_NUM_PROPERTIES
+};
+static GParamSpec* flickr_service_properties[FLICKR_SERVICE_NUM_PROPERTIES];
 #define _g_free0(var) (var = (g_free (var), NULL))
 
 #define PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER (publishing_flickr_flickr_publisher_get_type ())
@@ -77,16 +83,6 @@ typedef struct _PublishingFlickrPublishingParametersPrivate PublishingFlickrPubl
 typedef struct _PublishingFlickrParamSpecPublishingParameters PublishingFlickrParamSpecPublishingParameters;
 typedef struct _PublishingFlickrFlickrPublisherPrivate PublishingFlickrFlickrPublisherPrivate;
 
-#define PUBLISHING_FLICKR_TYPE_SESSION (publishing_flickr_session_get_type ())
-#define PUBLISHING_FLICKR_SESSION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSession))
-#define PUBLISHING_FLICKR_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSessionClass))
-#define PUBLISHING_FLICKR_IS_SESSION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_FLICKR_TYPE_SESSION))
-#define PUBLISHING_FLICKR_IS_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_FLICKR_TYPE_SESSION))
-#define PUBLISHING_FLICKR_SESSION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSessionClass))
-
-typedef struct _PublishingFlickrSession PublishingFlickrSession;
-typedef struct _PublishingFlickrSessionClass PublishingFlickrSessionClass;
-
 #define PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE (publishing_flickr_publishing_options_pane_get_type ())
 #define PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane))
 #define PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPaneClass))
@@ -96,22 +92,17 @@ typedef struct _PublishingFlickrSessionClass PublishingFlickrSessionClass;
 
 typedef struct _PublishingFlickrPublishingOptionsPane PublishingFlickrPublishingOptionsPane;
 typedef struct _PublishingFlickrPublishingOptionsPaneClass PublishingFlickrPublishingOptionsPaneClass;
+enum  {
+	PUBLISHING_FLICKR_FLICKR_PUBLISHER_0_PROPERTY,
+	PUBLISHING_FLICKR_FLICKR_PUBLISHER_NUM_PROPERTIES
+};
+static GParamSpec* publishing_flickr_flickr_publisher_properties[PUBLISHING_FLICKR_FLICKR_PUBLISHER_NUM_PROPERTIES];
 #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 _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))
-#define PUBLISHING_FLICKR_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_FLICKR_TYPE_TRANSACTION, PublishingFlickrTransactionClass))
-#define PUBLISHING_FLICKR_IS_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_FLICKR_TYPE_TRANSACTION))
-#define PUBLISHING_FLICKR_IS_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_FLICKR_TYPE_TRANSACTION))
-#define PUBLISHING_FLICKR_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_FLICKR_TYPE_TRANSACTION, PublishingFlickrTransactionClass))
-
-typedef struct _PublishingFlickrTransaction PublishingFlickrTransaction;
-typedef struct _PublishingFlickrTransactionClass PublishingFlickrTransactionClass;
-
 #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))
@@ -136,7 +127,6 @@ 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 _PublishingFlickrTransactionPrivate PublishingFlickrTransactionPrivate;
 typedef struct _PublishingFlickrAccountInfoFetchTransactionPrivate PublishingFlickrAccountInfoFetchTransactionPrivate;
 
 #define PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION (publishing_flickr_upload_transaction_get_type ())
@@ -149,8 +139,6 @@ typedef struct _PublishingFlickrAccountInfoFetchTransactionPrivate PublishingFli
 typedef struct _PublishingFlickrUploadTransaction PublishingFlickrUploadTransaction;
 typedef struct _PublishingFlickrUploadTransactionClass PublishingFlickrUploadTransactionClass;
 typedef struct _PublishingFlickrUploadTransactionPrivate PublishingFlickrUploadTransactionPrivate;
-typedef struct _PublishingFlickrSessionPrivate PublishingFlickrSessionPrivate;
-#define _publishing_rest_support_argument_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_argument_unref (var), NULL)))
 typedef struct _PublishingFlickrPublishingOptionsPanePrivate PublishingFlickrPublishingOptionsPanePrivate;
 
 #define PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY (publishing_flickr_publishing_options_pane_visibility_entry_get_type ())
@@ -172,6 +160,11 @@ typedef struct _PublishingFlickrPublishingOptionsPaneVisibilityEntryClass Publis
 
 typedef struct _PublishingFlickrPublishingOptionsPaneSizeEntry PublishingFlickrPublishingOptionsPaneSizeEntry;
 typedef struct _PublishingFlickrPublishingOptionsPaneSizeEntryClass PublishingFlickrPublishingOptionsPaneSizeEntryClass;
+enum  {
+	PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_0_PROPERTY,
+	PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_flickr_publishing_options_pane_properties[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_NUM_PROPERTIES];
 #define _g_slist_free0(var) ((var == NULL) ? NULL : (var = (g_slist_free (var), NULL)))
 typedef struct _PublishingFlickrPublishingOptionsPaneVisibilityEntryPrivate PublishingFlickrPublishingOptionsPaneVisibilityEntryPrivate;
 typedef struct _PublishingFlickrPublishingOptionsPaneSizeEntryPrivate PublishingFlickrPublishingOptionsPaneSizeEntryPrivate;
@@ -182,9 +175,9 @@ typedef struct _PublishingFlickrPublishingOptionsPaneParamSpecVisibilityEntry Pu
 enum  {
 	PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL,
 	PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL,
-	PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL
+	PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_NUM_SIGNALS
 };
-static guint publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0};
+static guint publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_NUM_SIGNALS] = {0};
 typedef struct _PublishingFlickrUploaderPrivate PublishingFlickrUploaderPrivate;
 #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; }
@@ -260,62 +253,32 @@ struct _PublishingFlickrFlickrPublisherPrivate {
 	GDestroyNotify progress_reporter_target_destroy_notify;
 	gboolean running;
 	gboolean was_started;
-	PublishingFlickrSession* session;
+	PublishingRESTSupportOAuth1Session* session;
 	PublishingFlickrPublishingOptionsPane* publishing_options_pane;
 	SpitPublishingAuthenticator* authenticator;
 	PublishingFlickrPublishingParameters* parameters;
 };
 
-struct _PublishingFlickrTransaction {
-	PublishingRESTSupportTransaction parent_instance;
-	PublishingFlickrTransactionPrivate * priv;
-};
-
-struct _PublishingFlickrTransactionClass {
-	PublishingRESTSupportTransactionClass parent_class;
-};
-
 struct _PublishingFlickrAccountInfoFetchTransaction {
-	PublishingFlickrTransaction parent_instance;
+	PublishingRESTSupportOAuth1Transaction parent_instance;
 	PublishingFlickrAccountInfoFetchTransactionPrivate * priv;
 };
 
 struct _PublishingFlickrAccountInfoFetchTransactionClass {
-	PublishingFlickrTransactionClass parent_class;
+	PublishingRESTSupportOAuth1TransactionClass parent_class;
 };
 
 struct _PublishingFlickrUploadTransaction {
-	PublishingRESTSupportUploadTransaction parent_instance;
+	PublishingRESTSupportOAuth1UploadTransaction parent_instance;
 	PublishingFlickrUploadTransactionPrivate * priv;
 };
 
 struct _PublishingFlickrUploadTransactionClass {
-	PublishingRESTSupportUploadTransactionClass parent_class;
+	PublishingRESTSupportOAuth1UploadTransactionClass parent_class;
 };
 
 struct _PublishingFlickrUploadTransactionPrivate {
 	PublishingFlickrPublishingParameters* parameters;
-	PublishingFlickrSession* session;
-	PublishingRESTSupportArgument** auth_header_fields;
-	gint auth_header_fields_length1;
-	gint _auth_header_fields_size_;
-};
-
-struct _PublishingFlickrSession {
-	PublishingRESTSupportSession parent_instance;
-	PublishingFlickrSessionPrivate * priv;
-};
-
-struct _PublishingFlickrSessionClass {
-	PublishingRESTSupportSessionClass parent_class;
-};
-
-struct _PublishingFlickrSessionPrivate {
-	gchar* access_phase_token;
-	gchar* access_phase_token_secret;
-	gchar* username;
-	gchar* consumer_key;
-	gchar* consumer_secret;
 };
 
 struct _PublishingFlickrPublishingOptionsPane {
@@ -410,10 +373,8 @@ 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_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;
 static gpointer publishing_flickr_publishing_options_pane_parent_class = NULL;
 static gpointer publishing_flickr_publishing_options_pane_size_entry_parent_class = NULL;
 static gpointer publishing_flickr_publishing_options_pane_visibility_entry_parent_class = NULL;
@@ -421,21 +382,28 @@ static SpitPublishingDialogPaneIface * publishing_flickr_publishing_options_pane
 static gpointer publishing_flickr_uploader_parent_class = NULL;
 
 GType flickr_service_get_type (void) G_GNUC_CONST;
-enum  {
-	FLICKR_SERVICE_DUMMY_PROPERTY
-};
 #define FLICKR_SERVICE_ICON_FILENAME "flickr.png"
 FlickrService* flickr_service_new (GFile* resource_directory);
-FlickrService* flickr_service_construct (GType object_type, GFile* resource_directory);
-static gint flickr_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface);
+FlickrService* flickr_service_construct (GType object_type,
+                                         GFile* resource_directory);
+static gint flickr_service_real_get_pluggable_interface (SpitPluggable* base,
+                                                  gint min_host_interface,
+                                                  gint max_host_interface);
 static const gchar* flickr_service_real_get_id (SpitPluggable* base);
 static const gchar* flickr_service_real_get_pluggable_name (SpitPluggable* base);
-static void flickr_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info);
-static GdkPixbuf** _vala_array_dup7 (GdkPixbuf** self, int length);
-static void flickr_service_real_activation (SpitPluggable* base, gboolean enabled);
-static SpitPublishingPublisher* flickr_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host);
-PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host);
-PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host);
+static void flickr_service_real_get_info (SpitPluggable* base,
+                                   SpitPluggableInfo* info);
+static GdkPixbuf** _vala_array_dup7 (GdkPixbuf** self,
+                              int length);
+static void flickr_service_real_activation (SpitPluggable* base,
+                                     gboolean enabled);
+static SpitPublishingPublisher* flickr_service_real_create_publisher (SpitPublishingService* base,
+                                                               SpitPublishingPluginHost* host);
+PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_new (SpitPublishingService* service,
+                                                                         SpitPublishingPluginHost* host);
+PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_construct (GType object_type,
+                                                                               SpitPublishingService* service,
+                                                                               SpitPublishingPluginHost* host);
 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);
@@ -443,208 +411,292 @@ static void flickr_service_finalize (GObject * obj);
 #define PUBLISHING_FLICKR_ENDPOINT_URL "https://api.flickr.com/services/rest"
 #define PUBLISHING_FLICKR_ORIGINAL_SIZE -1
 #define PUBLISHING_FLICKR_EXPIRED_SESSION_ERROR_CODE "98"
-#define PUBLISHING_FLICKR_ENCODE_RFC_3986_EXTRA "!*'();:@&=+$,/?%#[] \\"
 GType publishing_flickr_user_kind_get_type (void) G_GNUC_CONST;
 gpointer publishing_flickr_visibility_specification_ref (gpointer instance);
 void publishing_flickr_visibility_specification_unref (gpointer instance);
-GParamSpec* publishing_flickr_param_spec_visibility_specification (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_flickr_value_set_visibility_specification (GValue* value, gpointer v_object);
-void publishing_flickr_value_take_visibility_specification (GValue* value, gpointer v_object);
+GParamSpec* publishing_flickr_param_spec_visibility_specification (const gchar* name,
+                                                                   const gchar* nick,
+                                                                   const gchar* blurb,
+                                                                   GType object_type,
+                                                                   GParamFlags flags);
+void publishing_flickr_value_set_visibility_specification (GValue* value,
+                                                           gpointer v_object);
+void publishing_flickr_value_take_visibility_specification (GValue* value,
+                                                            gpointer v_object);
 gpointer publishing_flickr_value_get_visibility_specification (const GValue* value);
 GType publishing_flickr_visibility_specification_get_type (void) G_GNUC_CONST;
-enum  {
-	PUBLISHING_FLICKR_VISIBILITY_SPECIFICATION_DUMMY_PROPERTY
-};
-PublishingFlickrVisibilitySpecification* publishing_flickr_visibility_specification_new (gint friends_level, gint family_level, gint everyone_level);
-PublishingFlickrVisibilitySpecification* publishing_flickr_visibility_specification_construct (GType object_type, gint friends_level, gint family_level, gint everyone_level);
+PublishingFlickrVisibilitySpecification* publishing_flickr_visibility_specification_new (gint friends_level,
+                                                                                         gint family_level,
+                                                                                         gint everyone_level);
+PublishingFlickrVisibilitySpecification* publishing_flickr_visibility_specification_construct (GType object_type,
+                                                                                               gint friends_level,
+                                                                                               gint family_level,
+                                                                                               gint everyone_level);
 static void publishing_flickr_visibility_specification_finalize (PublishingFlickrVisibilitySpecification * obj);
 gpointer publishing_flickr_publishing_parameters_ref (gpointer instance);
 void publishing_flickr_publishing_parameters_unref (gpointer instance);
-GParamSpec* publishing_flickr_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_flickr_value_set_publishing_parameters (GValue* value, gpointer v_object);
-void publishing_flickr_value_take_publishing_parameters (GValue* value, gpointer v_object);
+GParamSpec* publishing_flickr_param_spec_publishing_parameters (const gchar* name,
+                                                                const gchar* nick,
+                                                                const gchar* blurb,
+                                                                GType object_type,
+                                                                GParamFlags flags);
+void publishing_flickr_value_set_publishing_parameters (GValue* value,
+                                                        gpointer v_object);
+void publishing_flickr_value_take_publishing_parameters (GValue* value,
+                                                         gpointer v_object);
 gpointer publishing_flickr_value_get_publishing_parameters (const GValue* value);
 GType publishing_flickr_publishing_parameters_get_type (void) G_GNUC_CONST;
-enum  {
-	PUBLISHING_FLICKR_PUBLISHING_PARAMETERS_DUMMY_PROPERTY
-};
 PublishingFlickrPublishingParameters* publishing_flickr_publishing_parameters_new (void);
 PublishingFlickrPublishingParameters* publishing_flickr_publishing_parameters_construct (GType object_type);
 static void publishing_flickr_publishing_parameters_finalize (PublishingFlickrPublishingParameters * obj);
-GType publishing_flickr_session_get_type (void) G_GNUC_CONST;
 GType publishing_flickr_publishing_options_pane_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_FLICKR_FLICKR_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisherPrivate))
-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_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_on_session_authenticated_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender,
+                                                                                                               gpointer 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);
-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);
+static void publishing_flickr_flickr_publisher_set_persistent_strip_metadata (PublishingFlickrFlickrPublisher* self,
+                                                                       gboolean strip_metadata);
 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);
-static void publishing_flickr_flickr_publisher_on_account_fetch_txn_error (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportTransaction* txn, GError* err);
-static void _publishing_flickr_flickr_publisher_on_account_fetch_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (PublishingFlickrFlickrPublisher* self, const gchar* xml);
+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);
+static void publishing_flickr_flickr_publisher_on_account_fetch_txn_error (PublishingFlickrFlickrPublisher* self,
+                                                                    PublishingRESTSupportTransaction* txn,
+                                                                    GError* err);
+static void _publishing_flickr_flickr_publisher_on_account_fetch_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                                       GError* err,
+                                                                                                                       gpointer self);
+static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (PublishingFlickrFlickrPublisher* self,
+                                                                        const gchar* xml);
 static void publishing_flickr_flickr_publisher_on_account_info_available (PublishingFlickrFlickrPublisher* self);
 static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane (PublishingFlickrFlickrPublisher* self);
-static void publishing_flickr_flickr_publisher_on_publishing_options_pane_publish (PublishingFlickrFlickrPublisher* self, gboolean strip_metadata);
-static void _publishing_flickr_flickr_publisher_on_publishing_options_pane_publish_publishing_flickr_publishing_options_pane_publish (PublishingFlickrPublishingOptionsPane* _sender, gboolean strip_metadata, gpointer self);
+static void publishing_flickr_flickr_publisher_on_publishing_options_pane_publish (PublishingFlickrFlickrPublisher* self,
+                                                                            gboolean strip_metadata);
+static void _publishing_flickr_flickr_publisher_on_publishing_options_pane_publish_publishing_flickr_publishing_options_pane_publish (PublishingFlickrPublishingOptionsPane* _sender,
+                                                                                                                               gboolean strip_metadata,
+                                                                                                                               gpointer self);
 static void publishing_flickr_flickr_publisher_on_publishing_options_pane_logout (PublishingFlickrFlickrPublisher* self);
-static void _publishing_flickr_flickr_publisher_on_publishing_options_pane_logout_publishing_flickr_publishing_options_pane_logout (PublishingFlickrPublishingOptionsPane* _sender, gpointer self);
-static void publishing_flickr_flickr_publisher_do_publish (PublishingFlickrFlickrPublisher* self, gboolean strip_metadata);
+static void _publishing_flickr_flickr_publisher_on_publishing_options_pane_logout_publishing_flickr_publishing_options_pane_logout (PublishingFlickrPublishingOptionsPane* _sender,
+                                                                                                                             gpointer self);
+static void publishing_flickr_flickr_publisher_do_publish (PublishingFlickrFlickrPublisher* self,
+                                                    gboolean strip_metadata);
 static void publishing_flickr_flickr_publisher_do_logout (PublishingFlickrFlickrPublisher* self);
-static void publishing_flickr_flickr_publisher_on_upload_status_updated (PublishingFlickrFlickrPublisher* self, gint file_number, gdouble completed_fraction);
-static void publishing_flickr_flickr_publisher_on_upload_complete (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published);
-static void _publishing_flickr_flickr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self);
-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_on_upload_status_updated (PublishingFlickrFlickrPublisher* self,
+                                                                  gint file_number,
+                                                                  gdouble completed_fraction);
+static void publishing_flickr_flickr_publisher_on_upload_complete (PublishingFlickrFlickrPublisher* self,
+                                                            PublishingRESTSupportBatchUploader* uploader,
+                                                            gint num_published);
+static void _publishing_flickr_flickr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender,
+                                                                                                                    gint num_photos_published,
+                                                                                                                    gpointer self);
+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);
-GType publishing_flickr_transaction_get_type (void) G_GNUC_CONST;
 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);
+PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetch_transaction_new (PublishingRESTSupportOAuth1Session* session);
+PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetch_transaction_construct (GType object_type,
+                                                                                                         PublishingRESTSupportOAuth1Session* session);
+PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_response (const gchar* xml,
+                                                                                       GError** error);
 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);
-gint publishing_flickr_flickr_publisher_flickr_date_time_compare_func (SpitPublishingPublishable* a, SpitPublishingPublishable* b);
-static gint _publishing_flickr_flickr_publisher_flickr_date_time_compare_func_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer 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);
+gint publishing_flickr_flickr_publisher_flickr_date_time_compare_func (SpitPublishingPublishable* a,
+                                                                       SpitPublishingPublishable* b);
+static gint _publishing_flickr_flickr_publisher_flickr_date_time_compare_func_gcompare_data_func (gconstpointer a,
+                                                                                           gconstpointer b,
+                                                                                           gpointer self);
 GType publishing_flickr_uploader_get_type (void) G_GNUC_CONST;
-PublishingFlickrUploader* publishing_flickr_uploader_new (PublishingFlickrSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingFlickrPublishingParameters* parameters, gboolean strip_metadata);
-PublishingFlickrUploader* publishing_flickr_uploader_construct (GType object_type, PublishingFlickrSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingFlickrPublishingParameters* parameters, gboolean strip_metadata);
-static void _publishing_flickr_flickr_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self);
+PublishingFlickrUploader* publishing_flickr_uploader_new (PublishingRESTSupportOAuth1Session* session,
+                                                          SpitPublishingPublishable** publishables,
+                                                          int publishables_length1,
+                                                          PublishingFlickrPublishingParameters* parameters,
+                                                          gboolean strip_metadata);
+PublishingFlickrUploader* publishing_flickr_uploader_construct (GType object_type,
+                                                                PublishingRESTSupportOAuth1Session* session,
+                                                                SpitPublishingPublishable** publishables,
+                                                                int publishables_length1,
+                                                                PublishingFlickrPublishingParameters* parameters,
+                                                                gboolean strip_metadata);
+static void _publishing_flickr_flickr_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number,
+                                                                                                     gdouble fraction_complete,
+                                                                                                     gpointer self);
 gint publishing_flickr_flickr_publisher_get_persistent_visibility (PublishingFlickrFlickrPublisher* self);
-void publishing_flickr_flickr_publisher_set_persistent_visibility (PublishingFlickrFlickrPublisher* self, gint vis);
+void publishing_flickr_flickr_publisher_set_persistent_visibility (PublishingFlickrFlickrPublisher* self,
+                                                                   gint vis);
 gint publishing_flickr_flickr_publisher_get_persistent_default_size (PublishingFlickrFlickrPublisher* self);
-void publishing_flickr_flickr_publisher_set_persistent_default_size (PublishingFlickrFlickrPublisher* self, gint size);
+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);
 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);
-enum  {
-	PUBLISHING_FLICKR_TRANSACTION_DUMMY_PROPERTY
-};
-PublishingFlickrTransaction* publishing_flickr_transaction_new (PublishingFlickrSession* session, PublishingRESTSupportHttpMethod method);
-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);
-void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, PublishingRESTSupportTransaction* txn);
 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_ACCOUNT_INFO_FETCH_TRANSACTION_DUMMY_PROPERTY
-};
-gchar* publishing_flickr_session_get_access_phase_token (PublishingFlickrSession* self);
+static gchar* _publishing_flickr_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc,
+                                                                                                                  gpointer 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  {
-	PUBLISHING_FLICKR_UPLOAD_TRANSACTION_DUMMY_PROPERTY
-};
-PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_new (PublishingFlickrSession* session, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublishable* publishable);
-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);
+PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_new (PublishingRESTSupportOAuth1Session* session,
+                                                                             PublishingFlickrPublishingParameters* parameters,
+                                                                             SpitPublishingPublishable* publishable);
+PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_construct (GType object_type,
+                                                                                   PublishingRESTSupportOAuth1Session* session,
+                                                                                   PublishingFlickrPublishingParameters* parameters,
+                                                                                   SpitPublishingPublishable* publishable);
 static void _g_free0_ (gpointer var);
-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);
-static void publishing_flickr_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error);
+static void publishing_flickr_upload_transaction_real_execute (PublishingRESTSupportTransaction* base,
+                                                        GError** error);
 static void publishing_flickr_upload_transaction_finalize (PublishingRESTSupportTransaction * obj);
-#define PUBLISHING_FLICKR_SESSION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSessionPrivate))
-enum  {
-	PUBLISHING_FLICKR_SESSION_DUMMY_PROPERTY
-};
-static gboolean publishing_flickr_session_real_is_authenticated (PublishingRESTSupportSession* base);
-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);
-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) G_GNUC_UNUSED;
-static void publishing_flickr_publishing_options_pane_value_set_visibility_entry (GValue* value, gpointer v_object) G_GNUC_UNUSED;
-static void publishing_flickr_publishing_options_pane_value_take_visibility_entry (GValue* value, gpointer v_object) G_GNUC_UNUSED;
+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) G_GNUC_UNUSED;
+static void publishing_flickr_publishing_options_pane_value_set_visibility_entry (GValue* value,
+                                                                           gpointer v_object) G_GNUC_UNUSED;
+static void publishing_flickr_publishing_options_pane_value_take_visibility_entry (GValue* value,
+                                                                            gpointer v_object) G_GNUC_UNUSED;
 static gpointer publishing_flickr_publishing_options_pane_value_get_visibility_entry (const GValue* value) G_GNUC_UNUSED;
 static GType publishing_flickr_publishing_options_pane_visibility_entry_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 static gpointer publishing_flickr_publishing_options_pane_size_entry_ref (gpointer instance);
 static void publishing_flickr_publishing_options_pane_size_entry_unref (gpointer instance);
-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) G_GNUC_UNUSED;
-static void publishing_flickr_publishing_options_pane_value_set_size_entry (GValue* value, gpointer v_object) G_GNUC_UNUSED;
-static void publishing_flickr_publishing_options_pane_value_take_size_entry (GValue* value, gpointer v_object) G_GNUC_UNUSED;
+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) G_GNUC_UNUSED;
+static void publishing_flickr_publishing_options_pane_value_set_size_entry (GValue* value,
+                                                                     gpointer v_object) G_GNUC_UNUSED;
+static void publishing_flickr_publishing_options_pane_value_take_size_entry (GValue* value,
+                                                                      gpointer v_object) G_GNUC_UNUSED;
 static gpointer publishing_flickr_publishing_options_pane_value_get_size_entry (const GValue* value) G_GNUC_UNUSED;
 static GType publishing_flickr_publishing_options_pane_size_entry_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 #define PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPanePrivate))
-enum  {
-	PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_DUMMY_PROPERTY
-};
-static PublishingFlickrPublishingOptionsPaneVisibilityEntry** publishing_flickr_publishing_options_pane_create_visibilities (PublishingFlickrPublishingOptionsPane* self, int* result_length1);
-static PublishingFlickrPublishingOptionsPaneSizeEntry** publishing_flickr_publishing_options_pane_create_sizes (PublishingFlickrPublishingOptionsPane* self, int* result_length1);
+static PublishingFlickrPublishingOptionsPaneVisibilityEntry** publishing_flickr_publishing_options_pane_create_visibilities (PublishingFlickrPublishingOptionsPane* self,
+                                                                                                                      int* result_length1);
+static PublishingFlickrPublishingOptionsPaneSizeEntry** publishing_flickr_publishing_options_pane_create_sizes (PublishingFlickrPublishingOptionsPane* self,
+                                                                                                         int* result_length1);
 static void publishing_flickr_publishing_options_pane_populate_visibility_combo (PublishingFlickrPublishingOptionsPane* self);
 static void publishing_flickr_publishing_options_pane_on_visibility_changed (PublishingFlickrPublishingOptionsPane* self);
-static void _publishing_flickr_publishing_options_pane_on_visibility_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void _publishing_flickr_publishing_options_pane_on_visibility_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+                                                                                             gpointer self);
 static void publishing_flickr_publishing_options_pane_populate_size_combo (PublishingFlickrPublishingOptionsPane* self);
 static void publishing_flickr_publishing_options_pane_on_size_changed (PublishingFlickrPublishingOptionsPane* self);
-static void _publishing_flickr_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void _publishing_flickr_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+                                                                                       gpointer self);
 static void publishing_flickr_publishing_options_pane_on_logout_clicked (PublishingFlickrPublishingOptionsPane* self);
-static void _publishing_flickr_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_flickr_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                      gpointer self);
 static void publishing_flickr_publishing_options_pane_on_publish_clicked (PublishingFlickrPublishingOptionsPane* self);
-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_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_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);
+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 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);
 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);
 static SpitPublishingDialogPaneGeometryOptions publishing_flickr_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
 static void publishing_flickr_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
-static void _publishing_flickr_publishing_options_pane_notify_publish_publishing_flickr_publishing_options_pane_publish (PublishingFlickrPublishingOptionsPane* _sender, gboolean strip_metadata, gpointer self);
-static void _publishing_flickr_publishing_options_pane_notify_logout_publishing_flickr_publishing_options_pane_logout (PublishingFlickrPublishingOptionsPane* _sender, gpointer self);
+static void _publishing_flickr_publishing_options_pane_notify_publish_publishing_flickr_publishing_options_pane_publish (PublishingFlickrPublishingOptionsPane* _sender,
+                                                                                                                  gboolean strip_metadata,
+                                                                                                                  gpointer self);
+static void _publishing_flickr_publishing_options_pane_notify_logout_publishing_flickr_publishing_options_pane_logout (PublishingFlickrPublishingOptionsPane* _sender,
+                                                                                                                gpointer self);
 static void publishing_flickr_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
-enum  {
-	PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_SIZE_ENTRY_DUMMY_PROPERTY
-};
 static void publishing_flickr_publishing_options_pane_size_entry_finalize (PublishingFlickrPublishingOptionsPaneSizeEntry * obj);
-enum  {
-	PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_VISIBILITY_ENTRY_DUMMY_PROPERTY
-};
 static void publishing_flickr_publishing_options_pane_visibility_entry_finalize (PublishingFlickrPublishingOptionsPaneVisibilityEntry * obj);
 static void publishing_flickr_publishing_options_pane_finalize (GObject * obj);
 #define PUBLISHING_FLICKR_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_FLICKR_TYPE_UPLOADER, PublishingFlickrUploaderPrivate))
-enum  {
-	PUBLISHING_FLICKR_UPLOADER_DUMMY_PROPERTY
-};
-static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrUploader* self, SpitPublishingPublishable* publishable);
-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_preprocess_publishable (PublishingFlickrUploader* self,
+                                                        SpitPublishingPublishable* publishable);
+static void _vala_array_add30 (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);
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
+static void _vala_array_destroy (gpointer array,
+                          gint array_length,
+                          GDestroyNotify destroy_func);
+static void _vala_array_free (gpointer array,
+                       gint array_length,
+                       GDestroyNotify destroy_func);
 static gint _vala_array_length (gpointer array);
 
 
-FlickrService* flickr_service_construct (GType object_type, GFile* resource_directory) {
+FlickrService*
+flickr_service_construct (GType object_type,
+                          GFile* resource_directory)
+{
 	FlickrService * self = NULL;
 	GdkPixbuf** _tmp0_;
 	gint _tmp0__length1;
@@ -658,7 +710,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 662 "FlickrPublishing.c"
+#line 714 "FlickrPublishing.c"
 		gint _tmp1_;
 		GdkPixbuf** _tmp2_;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -671,44 +723,43 @@ 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 675 "FlickrPublishing.c"
+#line 727 "FlickrPublishing.c"
 	}
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 679 "FlickrPublishing.c"
+#line 731 "FlickrPublishing.c"
 }
 
 
-FlickrService* flickr_service_new (GFile* resource_directory) {
+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 686 "FlickrPublishing.c"
+#line 740 "FlickrPublishing.c"
 }
 
 
-static gint flickr_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) {
+static gint
+flickr_service_real_get_pluggable_interface (SpitPluggable* base,
+                                             gint min_host_interface,
+                                             gint max_host_interface)
+{
 	FlickrService * self;
 	gint result = 0;
-	gint _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
 #line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FLICKR_SERVICE, FlickrService);
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = min_host_interface;
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = max_host_interface;
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = spit_negotiate_interfaces (_tmp0_, _tmp1_, SPIT_PUBLISHING_CURRENT_INTERFACE);
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	result = _tmp2_;
+	result = spit_negotiate_interfaces (min_host_interface, max_host_interface, SPIT_PUBLISHING_CURRENT_INTERFACE);
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 708 "FlickrPublishing.c"
+#line 757 "FlickrPublishing.c"
 }
 
 
-static const gchar* flickr_service_real_get_id (SpitPluggable* base) {
+static const gchar*
+flickr_service_real_get_id (SpitPluggable* base)
+{
 	FlickrService * self;
 	const gchar* result = NULL;
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -717,11 +768,13 @@ 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 721 "FlickrPublishing.c"
+#line 772 "FlickrPublishing.c"
 }
 
 
-static const gchar* flickr_service_real_get_pluggable_name (SpitPluggable* base) {
+static const gchar*
+flickr_service_real_get_pluggable_name (SpitPluggable* base)
+{
 	FlickrService * self;
 	const gchar* result = NULL;
 #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -730,39 +783,47 @@ 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 734 "FlickrPublishing.c"
+#line 787 "FlickrPublishing.c"
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+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 741 "FlickrPublishing.c"
+#line 796 "FlickrPublishing.c"
 }
 
 
-static GdkPixbuf** _vala_array_dup7 (GdkPixbuf** self, int length) {
+static GdkPixbuf**
+_vala_array_dup7 (GdkPixbuf** self,
+                  int length)
+{
 	GdkPixbuf** result;
 	int i;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = g_new0 (GdkPixbuf*, length + 1);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 752 "FlickrPublishing.c"
+#line 810 "FlickrPublishing.c"
 		GdkPixbuf* _tmp0_;
 #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 758 "FlickrPublishing.c"
+#line 816 "FlickrPublishing.c"
 	}
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 762 "FlickrPublishing.c"
+#line 820 "FlickrPublishing.c"
 }
 
 
-static void flickr_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) {
+static void
+flickr_service_real_get_info (SpitPluggable* base,
+                              SpitPluggableInfo* info)
+{
 	FlickrService * self;
 	gchar* _tmp0_;
 	gchar* _tmp1_;
@@ -837,40 +898,45 @@ static void flickr_service_real_get_info (SpitPluggable* base, SpitPluggableInfo
 	(*info).icons = _tmp8_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*info).icons_length1 = _tmp8__length1;
-#line 841 "FlickrPublishing.c"
+#line 902 "FlickrPublishing.c"
 }
 
 
-static void flickr_service_real_activation (SpitPluggable* base, gboolean enabled) {
+static void
+flickr_service_real_activation (SpitPluggable* base,
+                                gboolean enabled)
+{
 	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 849 "FlickrPublishing.c"
+#line 913 "FlickrPublishing.c"
 }
 
 
-static SpitPublishingPublisher* flickr_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) {
+static SpitPublishingPublisher*
+flickr_service_real_create_publisher (SpitPublishingService* base,
+                                      SpitPublishingPluginHost* host)
+{
 	FlickrService * self;
 	SpitPublishingPublisher* result = NULL;
-	SpitPublishingPluginHost* _tmp0_;
-	PublishingFlickrFlickrPublisher* _tmp1_;
+	PublishingFlickrFlickrPublisher* _tmp0_;
 #line 46 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FLICKR_SERVICE, FlickrService);
 #line 46 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = host;
+	_tmp0_ = publishing_flickr_flickr_publisher_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService), host);
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = publishing_flickr_flickr_publisher_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService), _tmp0_);
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
+	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 870 "FlickrPublishing.c"
+#line 934 "FlickrPublishing.c"
 }
 
 
-static SpitPublishingPublisherMediaType flickr_service_real_get_supported_media (SpitPublishingService* base) {
+static SpitPublishingPublisherMediaType
+flickr_service_real_get_supported_media (SpitPublishingService* base)
+{
 	FlickrService * self;
 	SpitPublishingPublisherMediaType result = 0;
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -879,20 +945,24 @@ 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 883 "FlickrPublishing.c"
+#line 949 "FlickrPublishing.c"
 }
 
 
-static void flickr_service_class_init (FlickrServiceClass * klass) {
+static void
+flickr_service_class_init (FlickrServiceClass * klass)
+{
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	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 892 "FlickrPublishing.c"
+#line 960 "FlickrPublishing.c"
 }
 
 
-static void flickr_service_spit_pluggable_interface_init (SpitPluggableIface * iface) {
+static void
+flickr_service_spit_pluggable_interface_init (SpitPluggableIface * iface)
+{
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	flickr_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -905,36 +975,44 @@ 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 909 "FlickrPublishing.c"
+#line 979 "FlickrPublishing.c"
 }
 
 
-static void flickr_service_spit_publishing_service_interface_init (SpitPublishingServiceIface * iface) {
+static void
+flickr_service_spit_publishing_service_interface_init (SpitPublishingServiceIface * iface)
+{
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	flickr_service_spit_publishing_service_parent_iface = g_type_interface_peek_parent (iface);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	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 920 "FlickrPublishing.c"
+#line 992 "FlickrPublishing.c"
 }
 
 
-static void flickr_service_instance_init (FlickrService * self) {
+static void
+flickr_service_instance_init (FlickrService * self)
+{
 }
 
 
-static void flickr_service_finalize (GObject * obj) {
+static void
+flickr_service_finalize (GObject * obj)
+{
 	FlickrService * self;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	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 934 "FlickrPublishing.c"
+#line 1010 "FlickrPublishing.c"
 }
 
 
-GType flickr_service_get_type (void) {
+GType
+flickr_service_get_type (void)
+{
 	static volatile gsize flickr_service_type_id__volatile = 0;
 	if (g_once_init_enter (&flickr_service_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (FlickrServiceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) flickr_service_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (FlickrService), 0, (GInstanceInitFunc) flickr_service_instance_init, NULL };
@@ -950,7 +1028,9 @@ GType flickr_service_get_type (void) {
 }
 
 
-GType publishing_flickr_user_kind_get_type (void) {
+GType
+publishing_flickr_user_kind_get_type (void)
+{
 	static volatile gsize publishing_flickr_user_kind_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_flickr_user_kind_type_id__volatile)) {
 		static const GEnumValue values[] = {{PUBLISHING_FLICKR_USER_KIND_PRO, "PUBLISHING_FLICKR_USER_KIND_PRO", "pro"}, {PUBLISHING_FLICKR_USER_KIND_FREE, "PUBLISHING_FLICKR_USER_KIND_FREE", "free"}, {0, NULL, NULL}};
@@ -962,245 +1042,286 @@ GType publishing_flickr_user_kind_get_type (void) {
 }
 
 
-PublishingFlickrVisibilitySpecification* publishing_flickr_visibility_specification_construct (GType object_type, gint friends_level, gint family_level, gint everyone_level) {
+PublishingFlickrVisibilitySpecification*
+publishing_flickr_visibility_specification_construct (GType object_type,
+                                                      gint friends_level,
+                                                      gint family_level,
+                                                      gint everyone_level)
+{
 	PublishingFlickrVisibilitySpecification* self = NULL;
-	gint _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrVisibilitySpecification*) g_type_create_instance (object_type);
+#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->friends_level = friends_level;
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = friends_level;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->friends_level = _tmp0_;
+	self->family_level = family_level;
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = family_level;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->family_level = _tmp1_;
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = everyone_level;
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->everyone_level = _tmp2_;
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->everyone_level = everyone_level;
+#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 987 "FlickrPublishing.c"
+#line 1063 "FlickrPublishing.c"
 }
 
 
-PublishingFlickrVisibilitySpecification* publishing_flickr_visibility_specification_new (gint friends_level, gint family_level, gint everyone_level) {
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+PublishingFlickrVisibilitySpecification*
+publishing_flickr_visibility_specification_new (gint friends_level,
+                                                gint family_level,
+                                                gint everyone_level)
+{
+#line 73 "/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 994 "FlickrPublishing.c"
+#line 1074 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_value_visibility_specification_init (GValue* value) {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+publishing_flickr_value_visibility_specification_init (GValue* value)
+{
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 1001 "FlickrPublishing.c"
+#line 1083 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_value_visibility_specification_free_value (GValue* value) {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+publishing_flickr_value_visibility_specification_free_value (GValue* value)
+{
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_visibility_specification_unref (value->data[0].v_pointer);
-#line 1010 "FlickrPublishing.c"
+#line 1094 "FlickrPublishing.c"
 	}
 }
 
 
-static void publishing_flickr_value_visibility_specification_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+publishing_flickr_value_visibility_specification_copy_value (const GValue* src_value,
+                                                             GValue* dest_value)
+{
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/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 1020 "FlickrPublishing.c"
+#line 1107 "FlickrPublishing.c"
 	} else {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1024 "FlickrPublishing.c"
+#line 1111 "FlickrPublishing.c"
 	}
 }
 
 
-static gpointer publishing_flickr_value_visibility_specification_peek_pointer (const GValue* value) {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static gpointer
+publishing_flickr_value_visibility_specification_peek_pointer (const GValue* value)
+{
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1032 "FlickrPublishing.c"
+#line 1121 "FlickrPublishing.c"
 }
 
 
-static gchar* publishing_flickr_value_visibility_specification_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static gchar*
+publishing_flickr_value_visibility_specification_collect_value (GValue* value,
+                                                                guint n_collect_values,
+                                                                GTypeCValue* collect_values,
+                                                                guint collect_flags)
+{
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 1039 "FlickrPublishing.c"
+#line 1133 "FlickrPublishing.c"
 		PublishingFlickrVisibilitySpecification * object;
 		object = collect_values[0].v_pointer;
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/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 1046 "FlickrPublishing.c"
+#line 1140 "FlickrPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/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 1050 "FlickrPublishing.c"
+#line 1144 "FlickrPublishing.c"
 		}
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = publishing_flickr_visibility_specification_ref (object);
-#line 1054 "FlickrPublishing.c"
+#line 1148 "FlickrPublishing.c"
 	} else {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1058 "FlickrPublishing.c"
+#line 1152 "FlickrPublishing.c"
 	}
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 1062 "FlickrPublishing.c"
+#line 1156 "FlickrPublishing.c"
 }
 
 
-static gchar* publishing_flickr_value_visibility_specification_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+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 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!object_p) {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/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 1073 "FlickrPublishing.c"
+#line 1172 "FlickrPublishing.c"
 	}
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = NULL;
-#line 1079 "FlickrPublishing.c"
+#line 1178 "FlickrPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1083 "FlickrPublishing.c"
+#line 1182 "FlickrPublishing.c"
 	} else {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = publishing_flickr_visibility_specification_ref (value->data[0].v_pointer);
-#line 1087 "FlickrPublishing.c"
+#line 1186 "FlickrPublishing.c"
 	}
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 1091 "FlickrPublishing.c"
+#line 1190 "FlickrPublishing.c"
 }
 
 
-GParamSpec* publishing_flickr_param_spec_visibility_specification (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_flickr_param_spec_visibility_specification (const gchar* name,
+                                                       const gchar* nick,
+                                                       const gchar* blurb,
+                                                       GType object_type,
+                                                       GParamFlags flags)
+{
 	PublishingFlickrParamSpecVisibilitySpecification* spec;
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/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 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 1105 "FlickrPublishing.c"
+#line 1210 "FlickrPublishing.c"
 }
 
 
-gpointer publishing_flickr_value_get_visibility_specification (const GValue* value) {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+gpointer
+publishing_flickr_value_get_visibility_specification (const GValue* value)
+{
+#line 68 "/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 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1114 "FlickrPublishing.c"
+#line 1221 "FlickrPublishing.c"
 }
 
 
-void publishing_flickr_value_set_visibility_specification (GValue* value, gpointer v_object) {
+void
+publishing_flickr_value_set_visibility_specification (GValue* value,
+                                                      gpointer v_object)
+{
 	PublishingFlickrVisibilitySpecification * old;
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/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 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (v_object) {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/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 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/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 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_visibility_specification_ref (value->data[0].v_pointer);
-#line 1134 "FlickrPublishing.c"
+#line 1244 "FlickrPublishing.c"
 	} else {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1138 "FlickrPublishing.c"
+#line 1248 "FlickrPublishing.c"
 	}
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_visibility_specification_unref (old);
-#line 1144 "FlickrPublishing.c"
+#line 1254 "FlickrPublishing.c"
 	}
 }
 
 
-void publishing_flickr_value_take_visibility_specification (GValue* value, gpointer v_object) {
+void
+publishing_flickr_value_take_visibility_specification (GValue* value,
+                                                       gpointer v_object)
+{
 	PublishingFlickrVisibilitySpecification * old;
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/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 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (v_object) {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/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 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/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 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1163 "FlickrPublishing.c"
+#line 1276 "FlickrPublishing.c"
 	} else {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1167 "FlickrPublishing.c"
+#line 1280 "FlickrPublishing.c"
 	}
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_visibility_specification_unref (old);
-#line 1173 "FlickrPublishing.c"
+#line 1286 "FlickrPublishing.c"
 	}
 }
 
 
-static void publishing_flickr_visibility_specification_class_init (PublishingFlickrVisibilitySpecificationClass * klass) {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+publishing_flickr_visibility_specification_class_init (PublishingFlickrVisibilitySpecificationClass * klass)
+{
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_visibility_specification_parent_class = g_type_class_peek_parent (klass);
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingFlickrVisibilitySpecificationClass *) klass)->finalize = publishing_flickr_visibility_specification_finalize;
-#line 1183 "FlickrPublishing.c"
+#line 1298 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_visibility_specification_instance_init (PublishingFlickrVisibilitySpecification * self) {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+publishing_flickr_visibility_specification_instance_init (PublishingFlickrVisibilitySpecification * self)
+{
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->ref_count = 1;
-#line 1190 "FlickrPublishing.c"
+#line 1307 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_visibility_specification_finalize (PublishingFlickrVisibilitySpecification * obj) {
+static void
+publishing_flickr_visibility_specification_finalize (PublishingFlickrVisibilitySpecification * obj)
+{
 	PublishingFlickrVisibilitySpecification * self;
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION, PublishingFlickrVisibilitySpecification);
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 1200 "FlickrPublishing.c"
+#line 1319 "FlickrPublishing.c"
 }
 
 
-GType publishing_flickr_visibility_specification_get_type (void) {
+GType
+publishing_flickr_visibility_specification_get_type (void)
+{
 	static volatile gsize publishing_flickr_visibility_specification_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_flickr_visibility_specification_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { publishing_flickr_value_visibility_specification_init, publishing_flickr_value_visibility_specification_free_value, publishing_flickr_value_visibility_specification_copy_value, publishing_flickr_value_visibility_specification_peek_pointer, "p", publishing_flickr_value_visibility_specification_collect_value, "p", publishing_flickr_value_visibility_specification_lcopy_value };
@@ -1214,259 +1335,308 @@ GType publishing_flickr_visibility_specification_get_type (void) {
 }
 
 
-gpointer publishing_flickr_visibility_specification_ref (gpointer instance) {
+gpointer
+publishing_flickr_visibility_specification_ref (gpointer instance)
+{
 	PublishingFlickrVisibilitySpecification * self;
 	self = instance;
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return instance;
-#line 1225 "FlickrPublishing.c"
+#line 1348 "FlickrPublishing.c"
 }
 
 
-void publishing_flickr_visibility_specification_unref (gpointer instance) {
+void
+publishing_flickr_visibility_specification_unref (gpointer instance)
+{
 	PublishingFlickrVisibilitySpecification * self;
 	self = instance;
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		PUBLISHING_FLICKR_VISIBILITY_SPECIFICATION_GET_CLASS (self)->finalize (self);
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1238 "FlickrPublishing.c"
+#line 1363 "FlickrPublishing.c"
 	}
 }
 
 
-PublishingFlickrPublishingParameters* publishing_flickr_publishing_parameters_construct (GType object_type) {
+PublishingFlickrPublishingParameters*
+publishing_flickr_publishing_parameters_construct (GType object_type)
+{
 	PublishingFlickrPublishingParameters* self = NULL;
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrPublishingParameters*) g_type_create_instance (object_type);
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 1249 "FlickrPublishing.c"
+#line 1376 "FlickrPublishing.c"
 }
 
 
-PublishingFlickrPublishingParameters* publishing_flickr_publishing_parameters_new (void) {
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+PublishingFlickrPublishingParameters*
+publishing_flickr_publishing_parameters_new (void)
+{
+#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_publishing_parameters_construct (PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS);
-#line 1256 "FlickrPublishing.c"
+#line 1385 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_value_publishing_parameters_init (GValue* value) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+publishing_flickr_value_publishing_parameters_init (GValue* value)
+{
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 1263 "FlickrPublishing.c"
+#line 1394 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_value_publishing_parameters_free_value (GValue* value) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+publishing_flickr_value_publishing_parameters_free_value (GValue* value)
+{
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_parameters_unref (value->data[0].v_pointer);
-#line 1272 "FlickrPublishing.c"
+#line 1405 "FlickrPublishing.c"
 	}
 }
 
 
-static void publishing_flickr_value_publishing_parameters_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+publishing_flickr_value_publishing_parameters_copy_value (const GValue* src_value,
+                                                          GValue* dest_value)
+{
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/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 1282 "FlickrPublishing.c"
+#line 1418 "FlickrPublishing.c"
 	} else {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1286 "FlickrPublishing.c"
+#line 1422 "FlickrPublishing.c"
 	}
 }
 
 
-static gpointer publishing_flickr_value_publishing_parameters_peek_pointer (const GValue* value) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static gpointer
+publishing_flickr_value_publishing_parameters_peek_pointer (const GValue* value)
+{
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1294 "FlickrPublishing.c"
+#line 1432 "FlickrPublishing.c"
 }
 
 
-static gchar* publishing_flickr_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static gchar*
+publishing_flickr_value_publishing_parameters_collect_value (GValue* value,
+                                                             guint n_collect_values,
+                                                             GTypeCValue* collect_values,
+                                                             guint collect_flags)
+{
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 1301 "FlickrPublishing.c"
+#line 1444 "FlickrPublishing.c"
 		PublishingFlickrPublishingParameters * object;
 		object = collect_values[0].v_pointer;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/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 1308 "FlickrPublishing.c"
+#line 1451 "FlickrPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/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 1312 "FlickrPublishing.c"
+#line 1455 "FlickrPublishing.c"
 		}
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = publishing_flickr_publishing_parameters_ref (object);
-#line 1316 "FlickrPublishing.c"
+#line 1459 "FlickrPublishing.c"
 	} else {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1320 "FlickrPublishing.c"
+#line 1463 "FlickrPublishing.c"
 	}
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 1324 "FlickrPublishing.c"
+#line 1467 "FlickrPublishing.c"
 }
 
 
-static gchar* publishing_flickr_value_publishing_parameters_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+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 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!object_p) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/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 1335 "FlickrPublishing.c"
+#line 1483 "FlickrPublishing.c"
 	}
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = NULL;
-#line 1341 "FlickrPublishing.c"
+#line 1489 "FlickrPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1345 "FlickrPublishing.c"
+#line 1493 "FlickrPublishing.c"
 	} else {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = publishing_flickr_publishing_parameters_ref (value->data[0].v_pointer);
-#line 1349 "FlickrPublishing.c"
+#line 1497 "FlickrPublishing.c"
 	}
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 1353 "FlickrPublishing.c"
+#line 1501 "FlickrPublishing.c"
 }
 
 
-GParamSpec* publishing_flickr_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_flickr_param_spec_publishing_parameters (const gchar* name,
+                                                    const gchar* nick,
+                                                    const gchar* blurb,
+                                                    GType object_type,
+                                                    GParamFlags flags)
+{
 	PublishingFlickrParamSpecPublishingParameters* spec;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/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 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 1367 "FlickrPublishing.c"
+#line 1521 "FlickrPublishing.c"
 }
 
 
-gpointer publishing_flickr_value_get_publishing_parameters (const GValue* value) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+gpointer
+publishing_flickr_value_get_publishing_parameters (const GValue* value)
+{
+#line 81 "/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 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1376 "FlickrPublishing.c"
+#line 1532 "FlickrPublishing.c"
 }
 
 
-void publishing_flickr_value_set_publishing_parameters (GValue* value, gpointer v_object) {
+void
+publishing_flickr_value_set_publishing_parameters (GValue* value,
+                                                   gpointer v_object)
+{
 	PublishingFlickrPublishingParameters * old;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/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 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (v_object) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/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 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/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 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_parameters_ref (value->data[0].v_pointer);
-#line 1396 "FlickrPublishing.c"
+#line 1555 "FlickrPublishing.c"
 	} else {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1400 "FlickrPublishing.c"
+#line 1559 "FlickrPublishing.c"
 	}
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_parameters_unref (old);
-#line 1406 "FlickrPublishing.c"
+#line 1565 "FlickrPublishing.c"
 	}
 }
 
 
-void publishing_flickr_value_take_publishing_parameters (GValue* value, gpointer v_object) {
+void
+publishing_flickr_value_take_publishing_parameters (GValue* value,
+                                                    gpointer v_object)
+{
 	PublishingFlickrPublishingParameters * old;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/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 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (v_object) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/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 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/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 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1425 "FlickrPublishing.c"
+#line 1587 "FlickrPublishing.c"
 	} else {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1429 "FlickrPublishing.c"
+#line 1591 "FlickrPublishing.c"
 	}
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_parameters_unref (old);
-#line 1435 "FlickrPublishing.c"
+#line 1597 "FlickrPublishing.c"
 	}
 }
 
 
-static void publishing_flickr_publishing_parameters_class_init (PublishingFlickrPublishingParametersClass * klass) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+publishing_flickr_publishing_parameters_class_init (PublishingFlickrPublishingParametersClass * klass)
+{
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_parameters_parent_class = g_type_class_peek_parent (klass);
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingFlickrPublishingParametersClass *) klass)->finalize = publishing_flickr_publishing_parameters_finalize;
-#line 1445 "FlickrPublishing.c"
+#line 1609 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_publishing_parameters_instance_init (PublishingFlickrPublishingParameters * self) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+publishing_flickr_publishing_parameters_instance_init (PublishingFlickrPublishingParameters * self)
+{
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->ref_count = 1;
-#line 1452 "FlickrPublishing.c"
+#line 1618 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_publishing_parameters_finalize (PublishingFlickrPublishingParameters * obj) {
+static void
+publishing_flickr_publishing_parameters_finalize (PublishingFlickrPublishingParameters * obj)
+{
 	PublishingFlickrPublishingParameters * self;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS, PublishingFlickrPublishingParameters);
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 85 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->username);
-#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (self->visibility_specification);
-#line 1466 "FlickrPublishing.c"
+#line 1634 "FlickrPublishing.c"
 }
 
 
-GType publishing_flickr_publishing_parameters_get_type (void) {
+GType
+publishing_flickr_publishing_parameters_get_type (void)
+{
 	static volatile gsize publishing_flickr_publishing_parameters_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_flickr_publishing_parameters_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { publishing_flickr_value_publishing_parameters_init, publishing_flickr_value_publishing_parameters_free_value, publishing_flickr_value_publishing_parameters_copy_value, publishing_flickr_value_publishing_parameters_peek_pointer, "p", publishing_flickr_value_publishing_parameters_collect_value, "p", publishing_flickr_value_publishing_parameters_lcopy_value };
@@ -1480,773 +1650,755 @@ GType publishing_flickr_publishing_parameters_get_type (void) {
 }
 
 
-gpointer publishing_flickr_publishing_parameters_ref (gpointer instance) {
+gpointer
+publishing_flickr_publishing_parameters_ref (gpointer instance)
+{
 	PublishingFlickrPublishingParameters * self;
 	self = instance;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return instance;
-#line 1491 "FlickrPublishing.c"
+#line 1663 "FlickrPublishing.c"
 }
 
 
-void publishing_flickr_publishing_parameters_unref (gpointer instance) {
+void
+publishing_flickr_publishing_parameters_unref (gpointer instance)
+{
 	PublishingFlickrPublishingParameters * self;
 	self = instance;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		PUBLISHING_FLICKR_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self);
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1504 "FlickrPublishing.c"
+#line 1678 "FlickrPublishing.c"
 	}
 }
 
 
-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"
+static void
+_publishing_flickr_flickr_publisher_on_session_authenticated_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender,
+                                                                                                          gpointer self)
+{
+#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_session_authenticated ((PublishingFlickrFlickrPublisher*) self);
-#line 1512 "FlickrPublishing.c"
+#line 1689 "FlickrPublishing.c"
 }
 
 
-PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) {
+PublishingFlickrFlickrPublisher*
+publishing_flickr_flickr_publisher_construct (GType object_type,
+                                              SpitPublishingService* service,
+                                              SpitPublishingPluginHost* host)
+{
 	PublishingFlickrFlickrPublisher * self = NULL;
 	SpitPublishingService* _tmp0_;
-	SpitPublishingService* _tmp1_;
-	SpitPublishingPluginHost* _tmp2_;
-	SpitPublishingPluginHost* _tmp3_;
-	PublishingFlickrSession* _tmp4_;
-	PublishingFlickrPublishingParameters* _tmp5_;
-	PublishingAuthenticatorFactory* _tmp6_;
-	PublishingAuthenticatorFactory* _tmp7_;
-	SpitPublishingPluginHost* _tmp8_;
-	SpitPublishingAuthenticator* _tmp9_;
-	SpitPublishingAuthenticator* _tmp10_;
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	SpitPublishingPluginHost* _tmp1_;
+	PublishingRESTSupportOAuth1Session* _tmp2_;
+	PublishingFlickrPublishingParameters* _tmp3_;
+	PublishingAuthenticatorFactory* _tmp4_;
+	PublishingAuthenticatorFactory* _tmp5_;
+	SpitPublishingAuthenticator* _tmp6_;
+	SpitPublishingAuthenticator* _tmp7_;
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrFlickrPublisher*) g_object_new (object_type, NULL);
+#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:106: FlickrPublisher instantiated.");
 #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;
+	_tmp0_ = _g_object_ref0 (service);
+#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_object_unref0 (self->priv->service);
+#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->service = _tmp0_;
 #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_tmp1_ = _g_object_ref0 (host);
 #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_object_unref0 (self->priv->service);
+	_g_object_unref0 (self->priv->host);
 #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->service = _tmp1_;
-#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = host;
+	self->priv->host = _tmp1_;
 #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = _g_object_ref0 (_tmp2_);
+	_tmp2_ = publishing_rest_support_oauth1_session_new (PUBLISHING_FLICKR_ENDPOINT_URL);
 #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_object_unref0 (self->priv->host);
+	_publishing_rest_support_session_unref0 (self->priv->session);
 #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->host = _tmp3_;
+	self->priv->session = _tmp2_;
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = publishing_flickr_session_new ();
+	_tmp3_ = publishing_flickr_publishing_parameters_new ();
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_publishing_rest_support_session_unref0 (self->priv->session);
+	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->session = _tmp4_;
+	self->priv->parameters = _tmp3_;
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = publishing_flickr_publishing_parameters_new ();
+	_tmp4_ = publishing_authenticator_factory_get_instance ();
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
+	_tmp5_ = _tmp4_;
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp6_ = spit_publishing_authenticator_factory_create (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY, SpitPublishingAuthenticatorFactory), "flickr", host);
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->parameters = _tmp5_;
-#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"
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->authenticator = _tmp6_;
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_object_unref0 (_tmp5_);
+#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp7_ = self->priv->authenticator;
+#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_signal_connect_object (_tmp7_, "authenticated", (GCallback) _publishing_flickr_flickr_publisher_on_session_authenticated_spit_publishing_authenticator_authenticated, self, 0);
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 1585 "FlickrPublishing.c"
+#line 1757 "FlickrPublishing.c"
 }
 
 
-PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+PublishingFlickrFlickrPublisher*
+publishing_flickr_flickr_publisher_new (SpitPublishingService* service,
+                                        SpitPublishingPluginHost* host)
+{
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_flickr_publisher_construct (PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, service, host);
-#line 1592 "FlickrPublishing.c"
+#line 1767 "FlickrPublishing.c"
 }
 
 
-SpitPublishingAuthenticator* publishing_flickr_flickr_publisher_get_authenticator (PublishingFlickrFlickrPublisher* self) {
+SpitPublishingAuthenticator*
+publishing_flickr_flickr_publisher_get_authenticator (PublishingFlickrFlickrPublisher* self)
+{
 	SpitPublishingAuthenticator* result = NULL;
 	SpitPublishingAuthenticator* _tmp0_;
 	SpitPublishingAuthenticator* _tmp1_;
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), NULL);
-#line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->authenticator;
-#line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 121 "/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"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp1_;
-#line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 1610 "FlickrPublishing.c"
+#line 1787 "FlickrPublishing.c"
 }
 
 
-static gboolean publishing_flickr_flickr_publisher_get_persistent_strip_metadata (PublishingFlickrFlickrPublisher* self) {
+static gboolean
+publishing_flickr_flickr_publisher_get_persistent_strip_metadata (PublishingFlickrFlickrPublisher* self)
+{
 	gboolean result = FALSE;
 	SpitPublishingPluginHost* _tmp0_;
-	gboolean _tmp1_;
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), FALSE);
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#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 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	result = _tmp1_;
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	result = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", FALSE);
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 1628 "FlickrPublishing.c"
+#line 1804 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_flickr_publisher_set_persistent_strip_metadata (PublishingFlickrFlickrPublisher* self, gboolean strip_metadata) {
+static void
+publishing_flickr_flickr_publisher_set_persistent_strip_metadata (PublishingFlickrFlickrPublisher* self,
+                                                                  gboolean strip_metadata)
+{
 	SpitPublishingPluginHost* _tmp0_;
-	gboolean _tmp1_;
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = strip_metadata;
-#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 1643 "FlickrPublishing.c"
+#line 129 "/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", strip_metadata);
+#line 1819 "FlickrPublishing.c"
 }
 
 
-static gpointer _g_variant_ref0 (gpointer self) {
-#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static gpointer
+_g_variant_ref0 (gpointer self)
+{
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? g_variant_ref (self) : NULL;
-#line 1650 "FlickrPublishing.c"
+#line 1828 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_flickr_publisher_on_session_authenticated (PublishingFlickrFlickrPublisher* self) {
-	gboolean _tmp0_;
+static void
+publishing_flickr_flickr_publisher_on_session_authenticated (PublishingFlickrFlickrPublisher* self)
+{
 	GHashTable* params = NULL;
-	SpitPublishingAuthenticator* _tmp1_;
-	GHashTable* _tmp2_;
+	SpitPublishingAuthenticator* _tmp0_;
+	GHashTable* _tmp1_;
 	GVariant* consumer_key = NULL;
 	GVariant* consumer_secret = NULL;
 	GVariant* auth_token = NULL;
 	GVariant* auth_token_secret = NULL;
 	GVariant* username = NULL;
-	GHashTable* _tmp3_;
-	gconstpointer _tmp4_ = NULL;
-	GVariant* _tmp5_;
-	GHashTable* _tmp6_;
-	gconstpointer _tmp7_ = NULL;
-	GVariant* _tmp8_;
-	PublishingFlickrSession* _tmp9_;
-	GVariant* _tmp10_;
-	const gchar* _tmp11_;
-	GVariant* _tmp12_;
-	const gchar* _tmp13_;
-	GHashTable* _tmp14_;
-	gconstpointer _tmp15_ = NULL;
-	GVariant* _tmp16_;
-	GHashTable* _tmp17_;
-	gconstpointer _tmp18_ = NULL;
-	GVariant* _tmp19_;
-	GHashTable* _tmp20_;
-	gconstpointer _tmp21_ = NULL;
-	GVariant* _tmp22_;
-	PublishingFlickrSession* _tmp23_;
-	GVariant* _tmp24_;
-	const gchar* _tmp25_;
-	GVariant* _tmp26_;
-	const gchar* _tmp27_;
-	GVariant* _tmp28_;
-	const gchar* _tmp29_;
-	PublishingFlickrPublishingParameters* _tmp30_;
-	PublishingFlickrSession* _tmp31_;
-	gchar* _tmp32_;
-#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	GHashTable* _tmp2_;
+	gconstpointer _tmp3_ = NULL;
+	GVariant* _tmp4_;
+	GHashTable* _tmp5_;
+	gconstpointer _tmp6_ = NULL;
+	GVariant* _tmp7_;
+	PublishingRESTSupportOAuth1Session* _tmp8_;
+	GVariant* _tmp9_;
+	const gchar* _tmp10_;
+	GVariant* _tmp11_;
+	const gchar* _tmp12_;
+	GHashTable* _tmp13_;
+	gconstpointer _tmp14_ = NULL;
+	GVariant* _tmp15_;
+	GHashTable* _tmp16_;
+	gconstpointer _tmp17_ = NULL;
+	GVariant* _tmp18_;
+	GHashTable* _tmp19_;
+	gconstpointer _tmp20_ = NULL;
+	GVariant* _tmp21_;
+	PublishingRESTSupportOAuth1Session* _tmp22_;
+	GVariant* _tmp23_;
+	const gchar* _tmp24_;
+	GVariant* _tmp25_;
+	const gchar* _tmp26_;
+	GVariant* _tmp27_;
+	const gchar* _tmp28_;
+	PublishingFlickrPublishingParameters* _tmp29_;
+	PublishingRESTSupportOAuth1Session* _tmp30_;
+	gchar* _tmp31_;
+#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #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 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (!_tmp0_) {
-#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 1702 "FlickrPublishing.c"
+#line 1879 "FlickrPublishing.c"
 	}
-#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:137: EVENT: a fully authenticated session has be" \
+#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:136: EVENT: a fully authenticated session has be" \
 "come available");
+#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp0_ = self->priv->authenticator;
+#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp1_ = spit_publishing_authenticator_get_authentication_parameter (_tmp0_);
+#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	params = _tmp1_;
 #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"
+#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	consumer_secret = NULL;
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	auth_token = NULL;
-#line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	auth_token_secret = NULL;
-#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	username = NULL;
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp2_ = params;
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_hash_table_lookup_extended (_tmp2_, "ConsumerKey", NULL, &_tmp3_);
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_variant_unref0 (consumer_key);
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp4_ = _g_variant_ref0 (_tmp3_);
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	consumer_key = _tmp4_;
 #line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = params;
+	_tmp5_ = params;
 #line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_hash_table_lookup_extended (_tmp3_, "ConsumerKey", NULL, &_tmp4_);
+	g_hash_table_lookup_extended (_tmp5_, "ConsumerSecret", NULL, &_tmp6_);
 #line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_variant_unref0 (consumer_key);
+	_g_variant_unref0 (consumer_secret);
 #line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = _g_variant_ref0 (_tmp4_);
+	_tmp7_ = _g_variant_ref0 (_tmp6_);
 #line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	consumer_key = _tmp5_;
+	consumer_secret = _tmp7_;
 #line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6_ = params;
+	_tmp8_ = self->priv->session;
 #line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_hash_table_lookup_extended (_tmp6_, "ConsumerSecret", NULL, &_tmp7_);
+	_tmp9_ = consumer_key;
 #line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_variant_unref0 (consumer_secret);
+	_tmp10_ = g_variant_get_string (_tmp9_, NULL);
+#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp11_ = consumer_secret;
 #line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp8_ = _g_variant_ref0 (_tmp7_);
+	_tmp12_ = g_variant_get_string (_tmp11_, NULL);
 #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_);
+	publishing_rest_support_oauth1_session_set_api_credentials (_tmp8_, _tmp10_, _tmp12_);
+#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp13_ = params;
+#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_hash_table_lookup_extended (_tmp13_, "AuthToken", NULL, &_tmp14_);
+#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_variant_unref0 (auth_token);
+#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp15_ = _g_variant_ref0 (_tmp14_);
+#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	auth_token = _tmp15_;
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp14_ = params;
+	_tmp16_ = params;
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_hash_table_lookup_extended (_tmp14_, "AuthToken", NULL, &_tmp15_);
+	g_hash_table_lookup_extended (_tmp16_, "AuthTokenSecret", NULL, &_tmp17_);
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_variant_unref0 (auth_token);
+	_g_variant_unref0 (auth_token_secret);
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp16_ = _g_variant_ref0 (_tmp15_);
+	_tmp18_ = _g_variant_ref0 (_tmp17_);
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	auth_token = _tmp16_;
+	auth_token_secret = _tmp18_;
 #line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp17_ = params;
+	_tmp19_ = params;
 #line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_hash_table_lookup_extended (_tmp17_, "AuthTokenSecret", NULL, &_tmp18_);
+	g_hash_table_lookup_extended (_tmp19_, "Username", NULL, &_tmp20_);
 #line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_variant_unref0 (auth_token_secret);
+	_g_variant_unref0 (username);
 #line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp19_ = _g_variant_ref0 (_tmp18_);
+	_tmp21_ = _g_variant_ref0 (_tmp20_);
 #line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	auth_token_secret = _tmp19_;
+	username = _tmp21_;
 #line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp20_ = params;
+	_tmp22_ = self->priv->session;
 #line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_hash_table_lookup_extended (_tmp20_, "Username", NULL, &_tmp21_);
+	_tmp23_ = auth_token;
 #line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_variant_unref0 (username);
+	_tmp24_ = g_variant_get_string (_tmp23_, NULL);
 #line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp22_ = _g_variant_ref0 (_tmp21_);
+	_tmp25_ = auth_token_secret;
 #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"
+	_tmp26_ = g_variant_get_string (_tmp25_, NULL);
+#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp27_ = username;
+#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp28_ = g_variant_get_string (_tmp27_, NULL);
+#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	publishing_rest_support_oauth1_session_set_access_phase_credentials (_tmp22_, _tmp24_, _tmp26_, _tmp28_);
+#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp29_ = self->priv->parameters;
+#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp30_ = self->priv->session;
+#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp31_ = publishing_rest_support_oauth1_session_get_username (_tmp30_);
+#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_free0 (_tmp29_->username);
+#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp29_->username = _tmp31_;
+#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_do_fetch_account_info (self);
-#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_variant_unref0 (username);
-#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 132 "/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"
+#line 132 "/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"
+#line 132 "/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"
+#line 132 "/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"
+#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_hash_table_unref0 (params);
-#line 1824 "FlickrPublishing.c"
+#line 2001 "FlickrPublishing.c"
 }
 
 
-static void _publishing_flickr_flickr_publisher_on_account_fetch_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+_publishing_flickr_flickr_publisher_on_account_fetch_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                                  gpointer self)
+{
+#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_account_fetch_txn_completed ((PublishingFlickrFlickrPublisher*) self, _sender);
-#line 1831 "FlickrPublishing.c"
+#line 2011 "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 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+_publishing_flickr_flickr_publisher_on_account_fetch_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                                  GError* err,
+                                                                                                                  gpointer self)
+{
+#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_account_fetch_txn_error ((PublishingFlickrFlickrPublisher*) self, _sender, err);
-#line 1838 "FlickrPublishing.c"
+#line 2022 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_flickr_publisher_on_account_fetch_txn_completed (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_flickr_flickr_publisher_on_account_fetch_txn_completed (PublishingFlickrFlickrPublisher* self,
+                                                                   PublishingRESTSupportTransaction* txn)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	gboolean _tmp4_;
-	PublishingRESTSupportTransaction* _tmp5_;
-	gchar* _tmp6_;
-	gchar* _tmp7_;
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
+#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
+#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_account_fetch_txn_completed_publishing_rest_support_transaction_completed, self);
 #line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = txn;
-#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #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 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = txn;
-#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 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);
+	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_account_fetch_txn_error_publishing_rest_support_transaction_network_error, self);
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #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 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (!_tmp4_) {
-#line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 1873 "FlickrPublishing.c"
+#line 2050 "FlickrPublishing.c"
 	}
-#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:168: EVENT: account fetch transaction response r" \
+#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:167: EVENT: account fetch transaction response r" \
 "eceived over the network");
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = txn;
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6_ = publishing_rest_support_transaction_get_response (_tmp5_);
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp7_ = _tmp6_;
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (self, _tmp7_);
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp7_);
-#line 1887 "FlickrPublishing.c"
+#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp2_ = publishing_rest_support_transaction_get_response (txn);
+#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp3_ = _tmp2_;
+#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (self, _tmp3_);
+#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_free0 (_tmp3_);
+#line 2062 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_flickr_publisher_on_account_fetch_txn_error (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportTransaction* txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_flickr_flickr_publisher_on_account_fetch_txn_error (PublishingFlickrFlickrPublisher* self,
+                                                               PublishingRESTSupportTransaction* txn,
+                                                               GError* err)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	gboolean _tmp4_;
-	SpitPublishingPluginHost* _tmp5_;
-	GError* _tmp6_;
-#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	SpitPublishingPluginHost* _tmp2_;
+#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_account_fetch_txn_completed_publishing_rest_support_transaction_completed, self);
 #line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = txn;
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #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 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 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = txn;
-#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 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 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));
+	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_account_fetch_txn_error_publishing_rest_support_transaction_network_error, self);
+#line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (!_tmp4_) {
-#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 1921 "FlickrPublishing.c"
+#line 2090 "FlickrPublishing.c"
 	}
-#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:180: EVENT: account fetch transaction caused a n" \
+#line 179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:179: EVENT: account fetch transaction caused a n" \
 "etwork error");
-#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = self->priv->host;
-#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6_ = err;
-#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_);
-#line 1931 "FlickrPublishing.c"
+#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp2_ = self->priv->host;
+#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	spit_publishing_plugin_host_post_error (_tmp2_, err);
+#line 2098 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_flickr_publisher_on_account_info_available (PublishingFlickrFlickrPublisher* self) {
-	gboolean _tmp0_;
-#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+publishing_flickr_flickr_publisher_on_account_info_available (PublishingFlickrFlickrPublisher* self)
+{
+#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
+#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #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 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (!_tmp0_) {
-#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 1945 "FlickrPublishing.c"
+#line 2111 "FlickrPublishing.c"
 	}
-#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:188: EVENT: account information has become avail" \
+#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:187: EVENT: account information has become avail" \
 "able");
-#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_do_show_publishing_options_pane (self);
-#line 1951 "FlickrPublishing.c"
+#line 2117 "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 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+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 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_publishing_options_pane_publish ((PublishingFlickrFlickrPublisher*) self, strip_metadata);
-#line 1958 "FlickrPublishing.c"
+#line 2128 "FlickrPublishing.c"
 }
 
 
-static void _publishing_flickr_flickr_publisher_on_publishing_options_pane_logout_publishing_flickr_publishing_options_pane_logout (PublishingFlickrPublishingOptionsPane* _sender, gpointer self) {
-#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+_publishing_flickr_flickr_publisher_on_publishing_options_pane_logout_publishing_flickr_publishing_options_pane_logout (PublishingFlickrPublishingOptionsPane* _sender,
+                                                                                                                        gpointer self)
+{
+#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_publishing_options_pane_logout ((PublishingFlickrFlickrPublisher*) self);
-#line 1965 "FlickrPublishing.c"
+#line 2138 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_flickr_publisher_on_publishing_options_pane_publish (PublishingFlickrFlickrPublisher* self, gboolean strip_metadata) {
+static void
+publishing_flickr_flickr_publisher_on_publishing_options_pane_publish (PublishingFlickrFlickrPublisher* self,
+                                                                       gboolean strip_metadata)
+{
 	PublishingFlickrPublishingOptionsPane* _tmp0_;
 	guint _tmp1_;
 	PublishingFlickrPublishingOptionsPane* _tmp2_;
 	guint _tmp3_;
-	gboolean _tmp4_;
-	gboolean _tmp5_;
-#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->publishing_options_pane;
-#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("publish", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE);
-#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 192 "/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 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = self->priv->publishing_options_pane;
-#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("logout", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp3_, NULL, FALSE);
-#line 194 "/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 (_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 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (!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"
-	_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 1996 "FlickrPublishing.c"
+#line 2168 "FlickrPublishing.c"
 	}
-#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:199: EVENT: user clicked the 'Publish' button in" \
+#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:198: EVENT: user clicked the 'Publish' button in" \
 " the publishing options pane");
-#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = strip_metadata;
-#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_do_publish (self, _tmp5_);
-#line 2004 "FlickrPublishing.c"
+#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	publishing_flickr_flickr_publisher_do_publish (self, strip_metadata);
+#line 2174 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_flickr_publisher_on_publishing_options_pane_logout (PublishingFlickrFlickrPublisher* self) {
+static void
+publishing_flickr_flickr_publisher_on_publishing_options_pane_logout (PublishingFlickrFlickrPublisher* self)
+{
 	PublishingFlickrPublishingOptionsPane* _tmp0_;
 	guint _tmp1_;
 	PublishingFlickrPublishingOptionsPane* _tmp2_;
 	guint _tmp3_;
-	gboolean _tmp4_;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->publishing_options_pane;
-#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("publish", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE);
-#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 203 "/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 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = self->priv->publishing_options_pane;
-#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("logout", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp3_, NULL, FALSE);
-#line 205 "/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 (_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 206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #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 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (!_tmp4_) {
-#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2034 "FlickrPublishing.c"
+#line 2203 "FlickrPublishing.c"
 	}
-#line 210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:210: EVENT: user clicked the 'Logout' button in " \
+#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:209: EVENT: user clicked the 'Logout' button in " \
 "the publishing options pane");
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_do_logout (self);
-#line 2040 "FlickrPublishing.c"
+#line 2209 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_flickr_publisher_on_upload_status_updated (PublishingFlickrFlickrPublisher* self, gint file_number, gdouble completed_fraction) {
-	gboolean _tmp0_;
-	gdouble _tmp1_;
-	SpitPublishingProgressCallback _tmp2_;
-	void* _tmp2__target;
-	SpitPublishingProgressCallback _tmp3_;
-	void* _tmp3__target;
-	gint _tmp4_;
-	gdouble _tmp5_;
-#line 215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+publishing_flickr_flickr_publisher_on_upload_status_updated (PublishingFlickrFlickrPublisher* self,
+                                                             gint file_number,
+                                                             gdouble completed_fraction)
+{
+	SpitPublishingProgressCallback _tmp0_;
+	void* _tmp0__target;
+	SpitPublishingProgressCallback _tmp1_;
+	void* _tmp1__target;
+#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
+#line 215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #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 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (!_tmp0_) {
-#line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2061 "FlickrPublishing.c"
-	}
-#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = completed_fraction;
-#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 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = self->priv->progress_reporter;
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2__target = self->priv->progress_reporter_target;
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_assert (_tmp2_ != NULL, "progress_reporter != null");
-#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = self->priv->progress_reporter;
-#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3__target = self->priv->progress_reporter_target;
-#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = file_number;
-#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = completed_fraction;
-#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 2083 "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 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 2228 "FlickrPublishing.c"
+	}
+#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:218: EVENT: uploader reports upload %.2f percent" \
+" complete.", 100.0 * completed_fraction);
+#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp0_ = self->priv->progress_reporter;
+#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp0__target = self->priv->progress_reporter_target;
+#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_assert (_tmp0_ != NULL, "progress_reporter != null");
+#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp1_ = self->priv->progress_reporter;
+#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp1__target = self->priv->progress_reporter_target;
+#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp1_ (file_number, completed_fraction, _tmp1__target);
+#line 2244 "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 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_upload_complete ((PublishingFlickrFlickrPublisher*) self, _sender, num_photos_published);
-#line 2090 "FlickrPublishing.c"
+#line 2255 "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 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+_publishing_flickr_flickr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender,
+                                                                                                         GError* err,
+                                                                                                         gpointer self)
+{
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_upload_error ((PublishingFlickrFlickrPublisher*) self, _sender, err);
-#line 2097 "FlickrPublishing.c"
+#line 2266 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_flickr_publisher_on_upload_complete (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published) {
-	gboolean _tmp0_;
-	gint _tmp1_;
-	PublishingRESTSupportBatchUploader* _tmp2_;
-	guint _tmp3_;
-	PublishingRESTSupportBatchUploader* _tmp4_;
-	guint _tmp5_;
-#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+publishing_flickr_flickr_publisher_on_upload_complete (PublishingFlickrFlickrPublisher* self,
+                                                       PublishingRESTSupportBatchUploader* uploader,
+                                                       gint num_published)
+{
+	guint _tmp0_;
+	guint _tmp1_;
+#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
+#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #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 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (!_tmp0_) {
-#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2118 "FlickrPublishing.c"
-	}
-#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = num_published;
-#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 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = uploader;
+#line 2285 "FlickrPublishing.c"
+	}
+#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:230: EVENT: uploader reports upload complete; %d" \
+" items published.", num_published);
+#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp0_, NULL, FALSE);
+#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
 #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);
+	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
 #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 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = uploader;
-#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 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 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
+#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_do_show_success_pane (self);
-#line 2138 "FlickrPublishing.c"
+#line 2299 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_flickr_publisher_on_upload_error (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err) {
-	gboolean _tmp0_;
-	GError* _tmp1_;
-	const gchar* _tmp2_;
-	PublishingRESTSupportBatchUploader* _tmp3_;
-	guint _tmp4_;
-	PublishingRESTSupportBatchUploader* _tmp5_;
-	guint _tmp6_;
-	SpitPublishingPluginHost* _tmp7_;
-	GError* _tmp8_;
-#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+publishing_flickr_flickr_publisher_on_upload_error (PublishingFlickrFlickrPublisher* self,
+                                                    PublishingRESTSupportBatchUploader* uploader,
+                                                    GError* err)
+{
+	const gchar* _tmp0_;
+	guint _tmp1_;
+	guint _tmp2_;
+	SpitPublishingPluginHost* _tmp3_;
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
+#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #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 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (!_tmp0_) {
-#line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2162 "FlickrPublishing.c"
-	}
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = err;
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = _tmp1_->message;
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:244: EVENT: uploader reports upload error = '%s'" \
-".", _tmp2_);
+#line 2320 "FlickrPublishing.c"
+	}
+#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp0_ = err->message;
+#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:243: EVENT: uploader reports upload error = '%s'" \
+".", _tmp0_);
+#line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
+#line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
 #line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = uploader;
+	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp2_, NULL, FALSE);
 #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 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 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = uploader;
-#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 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 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp7_ = self->priv->host;
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp8_ = err;
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 2188 "FlickrPublishing.c"
+	g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
+#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp3_ = self->priv->host;
+#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	spit_publishing_plugin_host_post_error (_tmp3_, err);
+#line 2338 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_flickr_publisher_do_fetch_account_info (PublishingFlickrFlickrPublisher* self) {
+static void
+publishing_flickr_flickr_publisher_do_fetch_account_info (PublishingFlickrFlickrPublisher* self)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	SpitPublishingPluginHost* _tmp1_;
 	PublishingFlickrAccountInfoFetchTransaction* txn = NULL;
-	PublishingFlickrSession* _tmp2_;
+	PublishingRESTSupportOAuth1Session* _tmp2_;
 	PublishingFlickrAccountInfoFetchTransaction* _tmp3_;
 	GError * _inner_error_ = NULL;
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:253: ACTION: running network transaction to fetc" \
+#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:252: ACTION: running network transaction to fetc" \
 "h account information");
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->host;
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_install_account_fetch_wait_pane (_tmp1_);
-#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = self->priv->session;
-#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = publishing_flickr_account_info_fetch_transaction_new (_tmp2_);
-#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	txn = _tmp3_;
-#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 258 "/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 260 "/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), "network-error", (GCallback) _publishing_flickr_flickr_publisher_on_account_fetch_txn_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 2221 "FlickrPublishing.c"
+#line 2373 "FlickrPublishing.c"
 	{
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 262 "/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 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2229 "FlickrPublishing.c"
+#line 2381 "FlickrPublishing.c"
 				goto __catch13_spit_publishing_publishing_error;
 			}
-#line 263 "/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 263 "/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: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 263 "/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 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 2240 "FlickrPublishing.c"
+#line 2392 "FlickrPublishing.c"
 		}
 	}
 	goto __finally13;
@@ -2255,438 +2407,430 @@ static void publishing_flickr_flickr_publisher_do_fetch_account_info (Publishing
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp4_;
 		GError* _tmp5_;
-#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		err = _inner_error_;
-#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_inner_error_ = NULL;
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp4_ = self->priv->host;
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp5_ = err;
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
-#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (err);
-#line 2261 "FlickrPublishing.c"
+#line 2413 "FlickrPublishing.c"
 	}
 	__finally13:
-#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_publishing_rest_support_transaction_unref0 (txn);
-#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 261 "/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 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2274 "FlickrPublishing.c"
+#line 2426 "FlickrPublishing.c"
 	}
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (txn);
-#line 2278 "FlickrPublishing.c"
+#line 2430 "FlickrPublishing.c"
 }
 
 
-static gint64 int64_parse (const gchar* str) {
+static gint64
+int64_parse (const gchar* str)
+{
 	gint64 result = 0LL;
-	const gchar* _tmp0_;
-	gint64 _tmp1_;
-#line 687 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	gint64 _tmp0_;
+#line 687 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (str != NULL, 0LL);
-#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = str;
-#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = g_ascii_strtoll (_tmp0_, NULL, (guint) 0);
-#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	result = _tmp1_;
-#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 688 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp0_ = g_ascii_strtoll (str, NULL, (guint) 0);
+#line 688 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	result = _tmp0_;
+#line 688 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	return result;
-#line 2296 "FlickrPublishing.c"
+#line 2447 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (PublishingFlickrFlickrPublisher* self, const gchar* xml) {
-	const gchar* _tmp0_;
+static void
+publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (PublishingFlickrFlickrPublisher* self,
+                                                                   const gchar* xml)
+{
 	GError * _inner_error_ = NULL;
-#line 269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (xml != NULL);
-#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = xml;
-#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 2311 "FlickrPublishing.c"
+#line 269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:269: ACTION: parsing account information from xm" \
+"l = '%s'", xml);
+#line 2462 "FlickrPublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* response_doc = NULL;
-		const gchar* _tmp1_;
-		PublishingRESTSupportXmlDocument* _tmp2_;
+		PublishingRESTSupportXmlDocument* _tmp0_;
 		xmlNode* root_node = NULL;
+		PublishingRESTSupportXmlDocument* _tmp1_;
+		xmlNode* _tmp2_;
+		xmlNode* user_node = NULL;
 		PublishingRESTSupportXmlDocument* _tmp3_;
 		xmlNode* _tmp4_;
-		xmlNode* user_node = NULL;
-		PublishingRESTSupportXmlDocument* _tmp5_;
-		xmlNode* _tmp6_;
-		xmlNode* _tmp7_;
+		xmlNode* _tmp5_;
 		gchar* is_pro_str = NULL;
-		PublishingRESTSupportXmlDocument* _tmp8_;
-		xmlNode* _tmp9_;
-		gchar* _tmp10_;
+		PublishingRESTSupportXmlDocument* _tmp6_;
+		xmlNode* _tmp7_;
+		gchar* _tmp8_;
 		xmlNode* bandwidth_node = NULL;
-		PublishingRESTSupportXmlDocument* _tmp11_;
-		xmlNode* _tmp12_;
-		xmlNode* _tmp13_;
+		PublishingRESTSupportXmlDocument* _tmp9_;
+		xmlNode* _tmp10_;
+		xmlNode* _tmp11_;
 		gchar* remaining_kb_str = NULL;
-		PublishingRESTSupportXmlDocument* _tmp14_;
-		xmlNode* _tmp15_;
-		gchar* _tmp16_;
+		PublishingRESTSupportXmlDocument* _tmp12_;
+		xmlNode* _tmp13_;
+		gchar* _tmp14_;
 		PublishingFlickrUserKind user_kind = 0;
-		const gchar* _tmp17_;
+		const gchar* _tmp15_;
 		gint64 quota_bytes_left = 0LL;
-		const gchar* _tmp20_;
-		gint64 _tmp21_;
-		PublishingFlickrPublishingParameters* _tmp22_;
-		gint64 _tmp23_;
-		PublishingFlickrPublishingParameters* _tmp24_;
-		PublishingFlickrUserKind _tmp25_;
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp1_ = xml;
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp2_ = publishing_flickr_transaction_parse_flickr_response (_tmp1_, &_inner_error_);
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		response_doc = _tmp2_;
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		const gchar* _tmp18_;
+		PublishingFlickrPublishingParameters* _tmp19_;
+		gint64 _tmp20_;
+		PublishingFlickrPublishingParameters* _tmp21_;
+		PublishingFlickrUserKind _tmp22_;
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp0_ = publishing_flickr_transaction_parse_flickr_response (xml, &_inner_error_);
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		response_doc = _tmp0_;
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2354 "FlickrPublishing.c"
+#line 2501 "FlickrPublishing.c"
 				goto __catch14_spit_publishing_publishing_error;
 			}
-#line 272 "/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: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 272 "/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 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 2363 "FlickrPublishing.c"
+#line 2510 "FlickrPublishing.c"
 		}
-#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp1_ = response_doc;
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp2_ = publishing_rest_support_xml_document_get_root_node (_tmp1_);
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		root_node = _tmp2_;
+#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp3_ = response_doc;
-#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp4_ = publishing_rest_support_xml_document_get_root_node (_tmp3_);
-#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		root_node = _tmp4_;
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp5_ = response_doc;
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp6_ = root_node;
-#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 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		user_node = _tmp7_;
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp4_ = root_node;
+#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp5_ = publishing_rest_support_xml_document_get_named_child (_tmp3_, _tmp4_, "user", &_inner_error_);
+#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		user_node = _tmp5_;
+#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2385 "FlickrPublishing.c"
+#line 2532 "FlickrPublishing.c"
 				goto __catch14_spit_publishing_publishing_error;
 			}
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 274 "/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 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 2396 "FlickrPublishing.c"
+#line 2543 "FlickrPublishing.c"
 		}
-#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp8_ = response_doc;
-#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp9_ = user_node;
-#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 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		is_pro_str = _tmp10_;
-#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp6_ = response_doc;
+#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp7_ = user_node;
+#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp8_ = publishing_rest_support_xml_document_get_property_value (_tmp6_, _tmp7_, "ispro", &_inner_error_);
+#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		is_pro_str = _tmp8_;
+#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2412 "FlickrPublishing.c"
+#line 2559 "FlickrPublishing.c"
 				goto __catch14_spit_publishing_publishing_error;
 			}
-#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 276 "/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 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 2423 "FlickrPublishing.c"
+#line 2570 "FlickrPublishing.c"
 		}
-#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp11_ = response_doc;
-#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp12_ = user_node;
-#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 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		bandwidth_node = _tmp13_;
-#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp9_ = response_doc;
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp10_ = user_node;
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp11_ = publishing_rest_support_xml_document_get_named_child (_tmp9_, _tmp10_, "bandwidth", &_inner_error_);
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		bandwidth_node = _tmp11_;
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (is_pro_str);
-#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2441 "FlickrPublishing.c"
+#line 2588 "FlickrPublishing.c"
 				goto __catch14_spit_publishing_publishing_error;
 			}
-#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (is_pro_str);
-#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 278 "/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 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 2454 "FlickrPublishing.c"
+#line 2601 "FlickrPublishing.c"
 		}
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp14_ = response_doc;
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp15_ = bandwidth_node;
-#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 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		remaining_kb_str = _tmp16_;
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp12_ = response_doc;
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp13_ = bandwidth_node;
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp14_ = publishing_rest_support_xml_document_get_property_value (_tmp12_, _tmp13_, "remainingkb", &_inner_error_);
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		remaining_kb_str = _tmp14_;
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (is_pro_str);
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2472 "FlickrPublishing.c"
+#line 2619 "FlickrPublishing.c"
 				goto __catch14_spit_publishing_publishing_error;
 			}
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (is_pro_str);
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 280 "/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 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 2485 "FlickrPublishing.c"
+#line 2632 "FlickrPublishing.c"
 		}
+#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp15_ = is_pro_str;
+#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		if (g_strcmp0 (_tmp15_, "0") == 0) {
 #line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp17_ = is_pro_str;
-#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		if (g_strcmp0 (_tmp17_, "0") == 0) {
-#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			user_kind = PUBLISHING_FLICKR_USER_KIND_FREE;
-#line 2493 "FlickrPublishing.c"
+#line 2640 "FlickrPublishing.c"
 		} else {
-			const gchar* _tmp18_;
-#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_tmp18_ = is_pro_str;
+			const gchar* _tmp16_;
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			_tmp16_ = is_pro_str;
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			if (g_strcmp0 (_tmp16_, "1") == 0) {
 #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			if (g_strcmp0 (_tmp18_, "1") == 0) {
-#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				user_kind = PUBLISHING_FLICKR_USER_KIND_PRO;
-#line 2502 "FlickrPublishing.c"
+#line 2649 "FlickrPublishing.c"
 			} else {
-				GError* _tmp19_;
-#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 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_inner_error_ = _tmp19_;
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+				GError* _tmp17_;
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+				_tmp17_ = 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 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+				_inner_error_ = _tmp17_;
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (remaining_kb_str);
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (is_pro_str);
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2517 "FlickrPublishing.c"
+#line 2664 "FlickrPublishing.c"
 					goto __catch14_spit_publishing_publishing_error;
 				}
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (remaining_kb_str);
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (is_pro_str);
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 288 "/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 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				g_clear_error (&_inner_error_);
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				return;
-#line 2532 "FlickrPublishing.c"
+#line 2679 "FlickrPublishing.c"
 			}
 		}
-#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp20_ = remaining_kb_str;
-#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp21_ = int64_parse (_tmp20_);
-#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		quota_bytes_left = _tmp21_ * 1024;
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp18_ = remaining_kb_str;
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		quota_bytes_left = int64_parse (_tmp18_) * 1024;
+#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp19_ = self->priv->parameters;
+#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp20_ = quota_bytes_left;
+#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp19_->quota_free_bytes = _tmp20_;
 #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp22_ = self->priv->parameters;
+		_tmp21_ = self->priv->parameters;
 #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp23_ = quota_bytes_left;
+		_tmp22_ = user_kind;
 #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp22_->quota_free_bytes = _tmp23_;
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp24_ = self->priv->parameters;
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp25_ = user_kind;
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp24_->user_kind = _tmp25_;
-#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp21_->user_kind = _tmp22_;
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (remaining_kb_str);
-#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (is_pro_str);
-#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 2559 "FlickrPublishing.c"
+#line 2704 "FlickrPublishing.c"
 	}
 	goto __finally14;
 	__catch14_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		GError* _tmp26_;
-		SpitPublishingPluginHost* _tmp27_;
-		GError* _tmp28_;
-#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		GError* _tmp23_;
+		SpitPublishingPluginHost* _tmp24_;
+		GError* _tmp25_;
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		err = _inner_error_;
-#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_inner_error_ = NULL;
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp23_ = err;
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		if (g_error_matches (_tmp23_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_EXPIRED_SESSION)) {
 #line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp26_ = err;
-#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 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			publishing_flickr_flickr_publisher_do_logout (self);
-#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_error_free0 (err);
-#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 2582 "FlickrPublishing.c"
+#line 2727 "FlickrPublishing.c"
 		}
+#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp24_ = self->priv->host;
+#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp25_ = err;
+#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		spit_publishing_plugin_host_post_error (_tmp24_, _tmp25_);
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp27_ = self->priv->host;
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp28_ = err;
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp27_, _tmp28_);
-#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (err);
-#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2594 "FlickrPublishing.c"
+#line 2739 "FlickrPublishing.c"
 	}
 	__finally14:
-#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 270 "/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 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2605 "FlickrPublishing.c"
+#line 2750 "FlickrPublishing.c"
 	}
-#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_account_info_available (self);
-#line 2609 "FlickrPublishing.c"
+#line 2754 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_flickr_publisher_do_logout (PublishingFlickrFlickrPublisher* self) {
+static void
+publishing_flickr_flickr_publisher_do_logout (PublishingFlickrFlickrPublisher* self)
+{
 	SpitPublishingAuthenticator* _tmp0_;
-	gboolean _tmp1_;
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:314: ACTION: logging user out, deauthenticating " \
+#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:313: ACTION: logging user out, deauthenticating " \
 "session, and erasing stored credentials");
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->authenticator;
+#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (spit_publishing_authenticator_can_logout (_tmp0_)) {
+#line 2770 "FlickrPublishing.c"
+		SpitPublishingAuthenticator* _tmp1_;
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = spit_publishing_authenticator_can_logout (_tmp0_);
+		_tmp1_ = self->priv->authenticator;
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp1_) {
-#line 2626 "FlickrPublishing.c"
-		SpitPublishingAuthenticator* _tmp2_;
-#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 2632 "FlickrPublishing.c"
+		spit_publishing_authenticator_logout (_tmp1_);
+#line 2776 "FlickrPublishing.c"
 	}
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->running = FALSE;
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_attempt_start (self);
-#line 2638 "FlickrPublishing.c"
+#line 2782 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane (PublishingFlickrFlickrPublisher* self) {
+static void
+publishing_flickr_flickr_publisher_do_show_publishing_options_pane (PublishingFlickrFlickrPublisher* self)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	GtkBuilder* builder = NULL;
 	GtkBuilder* _tmp1_;
 	PublishingFlickrPublishingParameters* _tmp8_;
 	SpitPublishingPluginHost* _tmp9_;
-	SpitPublishingPublisherMediaType _tmp10_;
-	GtkBuilder* _tmp11_;
-	gboolean _tmp12_;
+	GtkBuilder* _tmp10_;
+	PublishingFlickrPublishingOptionsPane* _tmp11_;
+	PublishingFlickrPublishingOptionsPane* _tmp12_;
 	PublishingFlickrPublishingOptionsPane* _tmp13_;
-	PublishingFlickrPublishingOptionsPane* _tmp14_;
+	SpitPublishingPluginHost* _tmp14_;
 	PublishingFlickrPublishingOptionsPane* _tmp15_;
-	SpitPublishingPluginHost* _tmp16_;
-	PublishingFlickrPublishingOptionsPane* _tmp17_;
 	GError * _inner_error_ = NULL;
-#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#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"
+#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:325: ACTION: displaying publishing options pane");
+#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = gtk_builder_new ();
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	builder = _tmp1_;
-#line 2669 "FlickrPublishing.c"
+#line 2813 "FlickrPublishing.c"
 	{
 		GtkBuilder* _tmp2_;
-#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp2_ = builder;
-#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 334 "/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 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2678 "FlickrPublishing.c"
+#line 2822 "FlickrPublishing.c"
 			goto __catch15_g_error;
 		}
 	}
@@ -2699,606 +2843,612 @@ static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane (
 		SpitPublishingPluginHost* _tmp5_;
 		GError* _tmp6_;
 		GError* _tmp7_;
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		e = _inner_error_;
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_inner_error_ = NULL;
-#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp3_ = e;
-#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp4_ = _tmp3_->message;
+#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		g_warning ("FlickrPublishing.vala:337: Could not parse UI file! Error: %s.", _tmp4_);
 #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 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 338 "/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, _ ("A file required for publishing is unavailable. Publishing to Flickr ca" \
 "n’t continue."));
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp7_ = _tmp6_;
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp5_, _tmp7_);
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (_tmp7_);
-#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (e);
-#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_object_unref0 (builder);
-#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2717 "FlickrPublishing.c"
+#line 2861 "FlickrPublishing.c"
 	}
 	__finally15:
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_object_unref0 (builder);
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 331 "/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 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2730 "FlickrPublishing.c"
+#line 2874 "FlickrPublishing.c"
 	}
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = self->priv->parameters;
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = self->priv->host;
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp10_ = spit_publishing_plugin_host_get_publishable_media_type (_tmp9_);
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp11_ = builder;
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp12_ = publishing_flickr_flickr_publisher_get_persistent_strip_metadata (self);
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp13_ = publishing_flickr_publishing_options_pane_new (self, _tmp8_, _tmp10_, _tmp11_, _tmp12_);
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp10_ = builder;
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp11_ = publishing_flickr_publishing_options_pane_new (self, _tmp8_, spit_publishing_plugin_host_get_publishable_media_type (_tmp9_), _tmp10_, publishing_flickr_flickr_publisher_get_persistent_strip_metadata (self));
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->publishing_options_pane);
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->publishing_options_pane = _tmp13_;
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->publishing_options_pane = _tmp11_;
+#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp12_ = self->priv->publishing_options_pane;
+#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_signal_connect_object (_tmp12_, "publish", (GCallback) _publishing_flickr_flickr_publisher_on_publishing_options_pane_publish_publishing_flickr_publishing_options_pane_publish, self, 0);
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp14_ = self->priv->publishing_options_pane;
+	_tmp13_ = self->priv->publishing_options_pane;
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_connect_object (_tmp14_, "publish", (GCallback) _publishing_flickr_flickr_publisher_on_publishing_options_pane_publish_publishing_flickr_publishing_options_pane_publish, self, 0);
+	g_signal_connect_object (_tmp13_, "logout", (GCallback) _publishing_flickr_flickr_publisher_on_publishing_options_pane_logout_publishing_flickr_publishing_options_pane_logout, self, 0);
+#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp14_ = self->priv->host;
 #line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp15_ = self->priv->publishing_options_pane;
 #line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_connect_object (_tmp15_, "logout", (GCallback) _publishing_flickr_flickr_publisher_on_publishing_options_pane_logout_publishing_flickr_publishing_options_pane_logout, self, 0);
-#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp16_ = self->priv->host;
-#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp17_ = self->priv->publishing_options_pane;
-#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	spit_publishing_plugin_host_install_dialog_pane (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (builder);
-#line 2764 "FlickrPublishing.c"
+#line 2904 "FlickrPublishing.c"
 }
 
 
-gint publishing_flickr_flickr_publisher_flickr_date_time_compare_func (SpitPublishingPublishable* a, SpitPublishingPublishable* b) {
+gint
+publishing_flickr_flickr_publisher_flickr_date_time_compare_func (SpitPublishingPublishable* a,
+                                                                  SpitPublishingPublishable* b)
+{
 	gint result = 0;
-	SpitPublishingPublishable* _tmp0_;
+	GDateTime* _tmp0_;
 	GDateTime* _tmp1_;
 	GDateTime* _tmp2_;
-	SpitPublishingPublishable* _tmp3_;
-	GDateTime* _tmp4_;
-	GDateTime* _tmp5_;
-	gint _tmp6_;
-	gint _tmp7_;
-#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	GDateTime* _tmp3_;
+	gint _tmp4_;
+#line 351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (a), 0);
-#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (b), 0);
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = a;
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = spit_publishing_publishable_get_exposure_date_time (_tmp0_);
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = _tmp1_;
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = b;
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = spit_publishing_publishable_get_exposure_date_time (_tmp3_);
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = _tmp4_;
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6_ = g_date_time_compare (_tmp2_, _tmp5_);
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp7_ = _tmp6_;
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_date_time_unref0 (_tmp5_);
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_date_time_unref0 (_tmp2_);
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	result = _tmp7_;
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp0_ = spit_publishing_publishable_get_exposure_date_time (a);
+#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp1_ = _tmp0_;
+#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp2_ = spit_publishing_publishable_get_exposure_date_time (b);
+#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp3_ = _tmp2_;
+#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp4_ = g_date_time_compare (_tmp1_, _tmp3_);
+#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_date_time_unref0 (_tmp3_);
+#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_date_time_unref0 (_tmp1_);
+#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	result = _tmp4_;
+#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 2806 "FlickrPublishing.c"
+#line 2940 "FlickrPublishing.c"
 }
 
 
-static gint _publishing_flickr_flickr_publisher_flickr_date_time_compare_func_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
+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 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 2815 "FlickrPublishing.c"
+#line 2953 "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 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+_publishing_flickr_flickr_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number,
+                                                                                                gdouble fraction_complete,
+                                                                                                gpointer self)
+{
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_upload_status_updated ((PublishingFlickrFlickrPublisher*) self, file_number, fraction_complete);
-#line 2822 "FlickrPublishing.c"
+#line 2964 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_flickr_publisher_do_publish (PublishingFlickrFlickrPublisher* self, gboolean strip_metadata) {
-	gboolean _tmp0_;
+static void
+publishing_flickr_flickr_publisher_do_publish (PublishingFlickrFlickrPublisher* self,
+                                               gboolean strip_metadata)
+{
+	SpitPublishingPluginHost* _tmp0_;
 	SpitPublishingPluginHost* _tmp1_;
-	SpitPublishingPluginHost* _tmp2_;
-	PublishingFlickrPublishingParameters* _tmp3_;
-	gint _tmp4_;
-	gboolean _tmp5_;
-	void* _tmp6_;
-	GDestroyNotify _tmp7_;
-	SpitPublishingProgressCallback _tmp8_;
-	gboolean _tmp9_;
+	PublishingFlickrPublishingParameters* _tmp2_;
+	gint _tmp3_;
+	void* _tmp4_;
+	GDestroyNotify _tmp5_;
+	SpitPublishingProgressCallback _tmp6_;
 	SpitPublishingPublishable** publishables = NULL;
-	SpitPublishingPluginHost* _tmp10_;
-	gint _tmp11_;
-	SpitPublishingPublishable** _tmp12_;
+	SpitPublishingPluginHost* _tmp7_;
+	gint _tmp8_;
+	SpitPublishingPublishable** _tmp9_;
 	gint publishables_length1;
 	gint _publishables_size_;
 	GeeArrayList* sorted_list = NULL;
-	GeeArrayList* _tmp13_;
-	SpitPublishingPublishable** _tmp14_;
-	gint _tmp14__length1;
-	GeeArrayList* _tmp18_;
+	GeeArrayList* _tmp10_;
+	SpitPublishingPublishable** _tmp11_;
+	gint _tmp11__length1;
+	GeeArrayList* _tmp15_;
 	PublishingFlickrUploader* uploader = NULL;
-	PublishingFlickrSession* _tmp19_;
-	GeeArrayList* _tmp20_;
-	gint _tmp21_;
-	gpointer* _tmp22_;
-	SpitPublishingPublishable** _tmp23_;
-	gint _tmp23__length1;
-	PublishingFlickrPublishingParameters* _tmp24_;
-	gboolean _tmp25_;
+	PublishingRESTSupportOAuth1Session* _tmp16_;
+	GeeArrayList* _tmp17_;
+	gint _tmp18_;
+	gpointer* _tmp19_;
+	SpitPublishingPublishable** _tmp20_;
+	gint _tmp20__length1;
+	PublishingFlickrPublishingParameters* _tmp21_;
+	PublishingFlickrUploader* _tmp22_;
+	PublishingFlickrUploader* _tmp23_;
+	PublishingFlickrUploader* _tmp24_;
+	PublishingFlickrUploader* _tmp25_;
 	PublishingFlickrUploader* _tmp26_;
-	PublishingFlickrUploader* _tmp27_;
-	PublishingFlickrUploader* _tmp28_;
-	PublishingFlickrUploader* _tmp29_;
-	PublishingFlickrUploader* _tmp30_;
-#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
+#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	publishing_flickr_flickr_publisher_set_persistent_strip_metadata (self, strip_metadata);
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = strip_metadata;
-#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_set_persistent_strip_metadata (self, _tmp0_);
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:359: ACTION: uploading media items to remote ser" \
+	g_debug ("FlickrPublishing.vala:358: ACTION: uploading media items to remote ser" \
 "ver.");
+#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp0_ = self->priv->host;
+#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->host;
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp1_, TRUE);
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = self->priv->host;
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = self->priv->parameters;
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = _tmp3_->photo_major_axis_size;
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = strip_metadata;
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp8_ = spit_publishing_plugin_host_serialize_publishables (_tmp2_, _tmp4_, _tmp5_, &_tmp6_, &_tmp7_);
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp2_ = self->priv->parameters;
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp3_ = _tmp2_->photo_major_axis_size;
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp6_ = spit_publishing_plugin_host_serialize_publishables (_tmp1_, _tmp3_, strip_metadata, &_tmp4_, &_tmp5_);
+#line 361 "/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 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter = NULL;
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter_target = NULL;
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->progress_reporter = _tmp8_;
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->progress_reporter_target = _tmp6_;
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->progress_reporter_target_destroy_notify = _tmp7_;
-#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 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->progress_reporter = _tmp6_;
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->progress_reporter_target = _tmp4_;
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->progress_reporter_target_destroy_notify = _tmp5_;
+#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (!_tmp9_) {
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2904 "FlickrPublishing.c"
+#line 3039 "FlickrPublishing.c"
 	}
+#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp7_ = self->priv->host;
+#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp9_ = spit_publishing_plugin_host_get_publishables (_tmp7_, &_tmp8_);
+#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	publishables = _tmp9_;
+#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	publishables_length1 = _tmp8_;
+#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_publishables_size_ = publishables_length1;
 #line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp10_ = self->priv->host;
-#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp12_ = spit_publishing_plugin_host_get_publishables (_tmp10_, &_tmp11_);
-#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishables = _tmp12_;
-#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishables_length1 = _tmp11_;
+	_tmp10_ = gee_array_list_new (SPIT_PUBLISHING_TYPE_PUBLISHABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_publishables_size_ = publishables_length1;
-#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp13_ = gee_array_list_new (SPIT_PUBLISHING_TYPE_PUBLISHABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	sorted_list = _tmp13_;
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp14_ = publishables;
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp14__length1 = publishables_length1;
-#line 2924 "FlickrPublishing.c"
+	sorted_list = _tmp10_;
+#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp11_ = publishables;
+#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp11__length1 = publishables_length1;
+#line 3059 "FlickrPublishing.c"
 	{
 		SpitPublishingPublishable** p_collection = NULL;
 		gint p_collection_length1 = 0;
 		gint _p_collection_size_ = 0;
 		gint p_it = 0;
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		p_collection = _tmp14_;
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		p_collection_length1 = _tmp14__length1;
-#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 2936 "FlickrPublishing.c"
-			SpitPublishingPublishable* _tmp15_;
+#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		p_collection = _tmp11_;
+#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		p_collection_length1 = _tmp11__length1;
+#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		for (p_it = 0; p_it < _tmp11__length1; p_it = p_it + 1) {
+#line 3071 "FlickrPublishing.c"
+			SpitPublishingPublishable* _tmp12_;
 			SpitPublishingPublishable* p = NULL;
+#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			_tmp12_ = _g_object_ref0 (p_collection[p_it]);
+#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			p = _tmp12_;
+#line 3078 "FlickrPublishing.c"
+			{
+				GeeArrayList* _tmp13_;
+				SpitPublishingPublishable* _tmp14_;
 #line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_tmp15_ = _g_object_ref0 (p_collection[p_it]);
+				_tmp13_ = sorted_list;
 #line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			p = _tmp15_;
-#line 2943 "FlickrPublishing.c"
-			{
-				GeeArrayList* _tmp16_;
-				SpitPublishingPublishable* _tmp17_;
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp16_ = sorted_list;
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp17_ = p;
-#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_);
+				_tmp14_ = p;
 #line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp14_);
+#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_object_unref0 (p);
-#line 2955 "FlickrPublishing.c"
+#line 3090 "FlickrPublishing.c"
 			}
 		}
 	}
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp18_ = sorted_list;
-#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 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp19_ = self->priv->session;
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp20_ = sorted_list;
-#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 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp15_ = sorted_list;
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	gee_list_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_LIST, GeeList), _publishing_flickr_flickr_publisher_flickr_date_time_compare_func_gcompare_data_func, NULL, NULL);
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp16_ = self->priv->session;
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp17_ = sorted_list;
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp19_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection), &_tmp18_);
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp20_ = _tmp19_;
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp20__length1 = _tmp18_;
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp21_ = self->priv->parameters;
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp22_ = publishing_flickr_uploader_new (_tmp16_, _tmp20_, _tmp18_, _tmp21_, strip_metadata);
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp23_ = _tmp22_;
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp20_ = (_vala_array_free (_tmp20_, _tmp20__length1, (GDestroyNotify) g_object_unref), NULL);
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	uploader = _tmp23_;
 #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp23__length1 = _tmp21_;
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp24_ = self->priv->parameters;
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp25_ = strip_metadata;
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp26_ = publishing_flickr_uploader_new (_tmp19_, _tmp23_, _tmp21_, _tmp24_, _tmp25_);
+	_tmp24_ = uploader;
 #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp27_ = _tmp26_;
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp23_ = (_vala_array_free (_tmp23_, _tmp23__length1, (GDestroyNotify) g_object_unref), NULL);
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	uploader = _tmp27_;
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, 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 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp28_ = uploader;
+	_tmp25_ = uploader;
 #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);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, 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 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp29_ = uploader;
+	_tmp26_ = uploader;
 #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 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp30_ = uploader;
-#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 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	publishing_rest_support_batch_uploader_upload (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), _publishing_flickr_flickr_publisher_on_upload_status_updated_spit_publishing_progress_callback, self);
+#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_rest_support_batch_uploader_unref0 (uploader);
-#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (sorted_list);
-#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 3003 "FlickrPublishing.c"
+#line 3136 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_flickr_publisher_do_show_success_pane (PublishingFlickrFlickrPublisher* self) {
+static void
+publishing_flickr_flickr_publisher_do_show_success_pane (PublishingFlickrFlickrPublisher* self)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	SpitPublishingPluginHost* _tmp1_;
-#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 385 "/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_debug ("FlickrPublishing.vala:387: ACTION: showing success pane.");
-#line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:386: ACTION: showing success pane.");
+#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
-#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->host;
-#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_install_success_pane (_tmp1_);
-#line 3022 "FlickrPublishing.c"
+#line 3157 "FlickrPublishing.c"
 }
 
 
-gint publishing_flickr_flickr_publisher_get_persistent_visibility (PublishingFlickrFlickrPublisher* self) {
+gint
+publishing_flickr_flickr_publisher_get_persistent_visibility (PublishingFlickrFlickrPublisher* self)
+{
 	gint result = 0;
 	SpitPublishingPluginHost* _tmp0_;
-	gint _tmp1_;
-#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), 0);
-#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#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 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	result = _tmp1_;
-#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	result = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "visibility", 0);
+#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 3040 "FlickrPublishing.c"
+#line 3174 "FlickrPublishing.c"
 }
 
 
-void publishing_flickr_flickr_publisher_set_persistent_visibility (PublishingFlickrFlickrPublisher* self, gint vis) {
+void
+publishing_flickr_flickr_publisher_set_persistent_visibility (PublishingFlickrFlickrPublisher* self,
+                                                              gint vis)
+{
 	SpitPublishingPluginHost* _tmp0_;
-	gint _tmp1_;
-#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = vis;
-#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 3055 "FlickrPublishing.c"
+#line 397 "/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", vis);
+#line 3189 "FlickrPublishing.c"
 }
 
 
-gint publishing_flickr_flickr_publisher_get_persistent_default_size (PublishingFlickrFlickrPublisher* self) {
+gint
+publishing_flickr_flickr_publisher_get_persistent_default_size (PublishingFlickrFlickrPublisher* self)
+{
 	gint result = 0;
 	SpitPublishingPluginHost* _tmp0_;
-	gint _tmp1_;
-#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), 0);
-#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#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 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	result = _tmp1_;
-#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	result = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_size", 1);
+#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 3073 "FlickrPublishing.c"
+#line 3206 "FlickrPublishing.c"
 }
 
 
-void publishing_flickr_flickr_publisher_set_persistent_default_size (PublishingFlickrFlickrPublisher* self, gint size) {
+void
+publishing_flickr_flickr_publisher_set_persistent_default_size (PublishingFlickrFlickrPublisher* self,
+                                                                gint size)
+{
 	SpitPublishingPluginHost* _tmp0_;
-	gint _tmp1_;
-#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = size;
-#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 3088 "FlickrPublishing.c"
+#line 405 "/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", size);
+#line 3221 "FlickrPublishing.c"
 }
 
 
-static SpitPublishingService* publishing_flickr_flickr_publisher_real_get_service (SpitPublishingPublisher* base) {
+static SpitPublishingService*
+publishing_flickr_flickr_publisher_real_get_service (SpitPublishingPublisher* base)
+{
 	PublishingFlickrFlickrPublisher * self;
 	SpitPublishingService* result = NULL;
 	SpitPublishingService* _tmp0_;
 	SpitPublishingService* _tmp1_;
-#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher);
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->service;
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp1_;
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 3107 "FlickrPublishing.c"
+#line 3242 "FlickrPublishing.c"
 }
 
 
-static gboolean publishing_flickr_flickr_publisher_real_is_running (SpitPublishingPublisher* base) {
+static gboolean
+publishing_flickr_flickr_publisher_real_is_running (SpitPublishingPublisher* base)
+{
 	PublishingFlickrFlickrPublisher * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_;
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher);
-#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->running;
-#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp0_;
-#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 3123 "FlickrPublishing.c"
+#line 3260 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_flickr_publisher_attempt_start (PublishingFlickrFlickrPublisher* self) {
+static void
+publishing_flickr_flickr_publisher_attempt_start (PublishingFlickrFlickrPublisher* self)
+{
 	SpitPublishingAuthenticator* _tmp0_;
-#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->running = TRUE;
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->was_started = TRUE;
-#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->authenticator;
-#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_authenticator_authenticate (_tmp0_);
-#line 3139 "FlickrPublishing.c"
+#line 3278 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_flickr_publisher_real_start (SpitPublishingPublisher* base) {
+static void
+publishing_flickr_flickr_publisher_real_start (SpitPublishingPublisher* base)
+{
 	PublishingFlickrFlickrPublisher * self;
 	gboolean _tmp0_;
-	gboolean _tmp1_;
-#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher);
+#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #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 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp0_) {
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 3155 "FlickrPublishing.c"
+#line 3293 "FlickrPublishing.c"
 	}
+#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp0_ = self->priv->was_started;
+#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (_tmp0_) {
 #line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = self->priv->was_started;
-#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp1_) {
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_error ("FlickrPublishing.vala:431: FlickrPublisher: start( ): can't start; thi" \
+		g_error ("FlickrPublishing.vala:430: FlickrPublisher: start( ): can't start; thi" \
 "s publisher is not restartable.");
-#line 3163 "FlickrPublishing.c"
+#line 3301 "FlickrPublishing.c"
 	}
-#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"
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:432: FlickrPublisher: starting interaction.");
+#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_attempt_start (self);
-#line 3169 "FlickrPublishing.c"
+#line 3307 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_flickr_publisher_real_stop (SpitPublishingPublisher* base) {
+static void
+publishing_flickr_flickr_publisher_real_stop (SpitPublishingPublisher* base)
+{
 	PublishingFlickrFlickrPublisher * self;
-	PublishingFlickrSession* _tmp0_;
-#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	PublishingRESTSupportOAuth1Session* _tmp0_;
+#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher);
-#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"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:438: FlickrPublisher: stop( ) invoked.");
+#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->session;
-#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp0_ != NULL) {
-#line 3184 "FlickrPublishing.c"
-		PublishingFlickrSession* _tmp1_;
-#line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 3324 "FlickrPublishing.c"
+		PublishingRESTSupportOAuth1Session* _tmp1_;
+#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp1_ = self->priv->session;
-#line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 441 "/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 3190 "FlickrPublishing.c"
+#line 3330 "FlickrPublishing.c"
 	}
-#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->running = FALSE;
-#line 3194 "FlickrPublishing.c"
+#line 3334 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_flickr_publisher_class_init (PublishingFlickrFlickrPublisherClass * klass) {
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+publishing_flickr_flickr_publisher_class_init (PublishingFlickrFlickrPublisherClass * klass)
+{
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_parent_class = g_type_class_peek_parent (klass);
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFlickrFlickrPublisherPrivate));
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_flickr_flickr_publisher_finalize;
-#line 3205 "FlickrPublishing.c"
+#line 3347 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_flickr_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface) {
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+publishing_flickr_flickr_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface)
+{
+#line 92 "/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 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	iface->get_service = (SpitPublishingService* (*) (SpitPublishingPublisher *)) publishing_flickr_flickr_publisher_real_get_service;
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	iface->is_running = (gboolean (*) (SpitPublishingPublisher *)) publishing_flickr_flickr_publisher_real_is_running;
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	iface->start = (void (*) (SpitPublishingPublisher *)) publishing_flickr_flickr_publisher_real_start;
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_flickr_flickr_publisher_real_stop;
-#line 3220 "FlickrPublishing.c"
+#line 3364 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_flickr_publisher_instance_init (PublishingFlickrFlickrPublisher * self) {
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+publishing_flickr_flickr_publisher_instance_init (PublishingFlickrFlickrPublisher * self)
+{
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv = PUBLISHING_FLICKR_FLICKR_PUBLISHER_GET_PRIVATE (self);
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter = NULL;
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter_target = self;
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->running = FALSE;
-#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->was_started = FALSE;
-#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->session = NULL;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->publishing_options_pane = NULL;
-#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->authenticator = NULL;
-#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->parameters = NULL;
-#line 3245 "FlickrPublishing.c"
+#line 3391 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_flickr_publisher_finalize (GObject * obj) {
+static void
+publishing_flickr_flickr_publisher_finalize (GObject * obj)
+{
 	PublishingFlickrFlickrPublisher * self;
 	SpitPublishingAuthenticator* _tmp0_;
 	guint _tmp1_;
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher);
-#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->authenticator;
-#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 117 "/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"
+#line 117 "/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"
+#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->service);
-#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->host);
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 95 "/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 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter = NULL;
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter_target = NULL;
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->publishing_options_pane);
-#line 101 "/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->authenticator);
-#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_OBJECT_CLASS (publishing_flickr_flickr_publisher_parent_class)->finalize (obj);
-#line 3283 "FlickrPublishing.c"
+#line 3431 "FlickrPublishing.c"
 }
 
 
-GType publishing_flickr_flickr_publisher_get_type (void) {
+GType
+publishing_flickr_flickr_publisher_get_type (void)
+{
 	static volatile gsize publishing_flickr_flickr_publisher_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_flickr_flickr_publisher_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingFlickrFlickrPublisherClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_flickr_flickr_publisher_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFlickrFlickrPublisher), 0, (GInstanceInitFunc) publishing_flickr_flickr_publisher_instance_init, NULL };
@@ -3312,2945 +3462,1317 @@ GType publishing_flickr_flickr_publisher_get_type (void) {
 }
 
 
-PublishingFlickrTransaction* publishing_flickr_transaction_construct (GType object_type, PublishingFlickrSession* session, PublishingRESTSupportHttpMethod method) {
-	PublishingFlickrTransaction* self = NULL;
-	PublishingFlickrSession* _tmp0_;
-	PublishingRESTSupportHttpMethod _tmp1_;
-	PublishingFlickrSession* _tmp2_;
-	gchar* _tmp3_;
-	gchar* _tmp4_;
-	PublishingFlickrSession* _tmp5_;
-	gchar* _tmp6_;
-	gchar* _tmp7_;
-	PublishingFlickrSession* _tmp8_;
-	gchar* _tmp9_;
-	gchar* _tmp10_;
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL);
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = session;
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = method;
-#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 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = session;
-#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = publishing_flickr_session_get_oauth_nonce (_tmp2_);
-#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = _tmp3_;
-#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 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp4_);
-#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 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 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 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = session;
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6_ = publishing_flickr_session_get_oauth_timestamp (_tmp5_);
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp7_ = _tmp6_;
-#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 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp7_);
-#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 3360 "FlickrPublishing.c"
-}
-
-
-PublishingFlickrTransaction* publishing_flickr_transaction_new (PublishingFlickrSession* session, PublishingRESTSupportHttpMethod method) {
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return publishing_flickr_transaction_construct (PUBLISHING_FLICKR_TYPE_TRANSACTION, session, method);
-#line 3367 "FlickrPublishing.c"
-}
-
-
-PublishingFlickrTransaction* publishing_flickr_transaction_construct_with_uri (GType object_type, PublishingFlickrSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method) {
-	PublishingFlickrTransaction* self = NULL;
-	PublishingFlickrSession* _tmp0_;
-	const gchar* _tmp1_;
-	PublishingRESTSupportHttpMethod _tmp2_;
-	PublishingFlickrSession* _tmp3_;
-	gchar* _tmp4_;
-	gchar* _tmp5_;
-	PublishingFlickrSession* _tmp6_;
-	gchar* _tmp7_;
-	gchar* _tmp8_;
-	PublishingFlickrSession* _tmp9_;
-	gchar* _tmp10_;
-	gchar* _tmp11_;
-#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL);
-#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (uri != NULL, NULL);
-#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = session;
-#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = uri;
-#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = method;
-#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 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = session;
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = publishing_flickr_session_get_oauth_nonce (_tmp3_);
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = _tmp4_;
-#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 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp5_);
-#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 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 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 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6_ = session;
-#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp7_ = publishing_flickr_session_get_oauth_timestamp (_tmp6_);
-#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp8_ = _tmp7_;
-#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 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp8_);
-#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 3435 "FlickrPublishing.c"
-}
-
-
-PublishingFlickrTransaction* publishing_flickr_transaction_new_with_uri (PublishingFlickrSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method) {
-#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 3442 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) {
-	PublishingFlickrTransaction * self;
-	PublishingRESTSupportSession* _tmp0_;
-	PublishingFlickrSession* _tmp1_;
-	GError * _inner_error_ = NULL;
-#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_TRANSACTION, PublishingFlickrTransaction);
-#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 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSession);
-#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 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_publishing_rest_support_session_unref0 (_tmp1_);
-#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 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			g_propagate_error (error, _inner_error_);
-#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			return;
-#line 3471 "FlickrPublishing.c"
-		} else {
-#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 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			g_clear_error (&_inner_error_);
-#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			return;
-#line 3479 "FlickrPublishing.c"
-		}
-	}
-}
-
-
-gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc) {
+gchar*
+publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc)
+{
 	gchar* result = NULL;
 	xmlNode* root = NULL;
-	PublishingRESTSupportXmlDocument* _tmp0_;
-	xmlNode* _tmp1_;
+	xmlNode* _tmp0_;
 	gchar* status = NULL;
-	xmlNode* _tmp2_;
-	gchar* _tmp3_;
-	const gchar* _tmp4_;
-	const gchar* _tmp6_;
+	xmlNode* _tmp1_;
+	gchar* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp5_;
 	xmlNode* errcode = NULL;
-	xmlNode* _tmp12_;
-	gchar* _tmp13_;
+	xmlNode* _tmp10_;
+	gchar* _tmp11_;
+	gchar* _tmp12_;
+	xmlNode* _tmp13_;
 	gchar* _tmp14_;
-	xmlNode* _tmp15_;
+	gchar* _tmp15_;
 	gchar* _tmp16_;
 	gchar* _tmp17_;
-	gchar* _tmp18_;
-	gchar* _tmp19_;
 	GError * _inner_error_ = NULL;
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL);
-#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = doc;
-#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = publishing_rest_support_xml_document_get_root_node (_tmp0_);
-#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	root = _tmp1_;
-#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = root;
-#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = (gchar*) xmlGetProp (_tmp2_, (xmlChar*) "stat");
-#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	status = _tmp3_;
-#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = status;
-#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp4_ == NULL) {
-#line 3523 "FlickrPublishing.c"
-		gchar* _tmp5_;
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp5_ = g_strdup ("No status property in root node");
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		result = _tmp5_;
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp0_ = publishing_rest_support_xml_document_get_root_node (doc);
+#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	root = _tmp0_;
+#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp1_ = root;
+#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp2_ = (gchar*) xmlGetProp (_tmp1_, (xmlChar*) "stat");
+#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	status = _tmp2_;
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp3_ = status;
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (_tmp3_ == NULL) {
+#line 3488 "FlickrPublishing.c"
+		gchar* _tmp4_;
+#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp4_ = g_strdup ("No status property in root node");
+#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		result = _tmp4_;
+#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (status);
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return result;
-#line 3533 "FlickrPublishing.c"
+#line 3498 "FlickrPublishing.c"
 	}
-#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6_ = status;
-#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (g_strcmp0 (_tmp6_, "ok") == 0) {
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp5_ = status;
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (g_strcmp0 (_tmp5_, "ok") == 0) {
+#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		result = NULL;
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (status);
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return result;
-#line 3545 "FlickrPublishing.c"
+#line 3510 "FlickrPublishing.c"
 	}
 	{
-		xmlNode* _tmp7_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp8_;
-		xmlNode* _tmp9_;
-		xmlNode* _tmp10_;
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp8_ = doc;
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp9_ = root;
-#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 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp7_ = _tmp10_;
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		xmlNode* _tmp6_ = NULL;
+		xmlNode* _tmp7_;
+		xmlNode* _tmp8_;
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp7_ = root;
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp8_ = publishing_rest_support_xml_document_get_named_child (doc, _tmp7_, "err", &_inner_error_);
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp6_ = _tmp8_;
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3564 "FlickrPublishing.c"
+#line 3526 "FlickrPublishing.c"
 				goto __catch16_spit_publishing_publishing_error;
 			}
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (status);
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 461 "/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 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return NULL;
-#line 3575 "FlickrPublishing.c"
+#line 3537 "FlickrPublishing.c"
 		}
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		errcode = _tmp7_;
-#line 3579 "FlickrPublishing.c"
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		errcode = _tmp6_;
+#line 3541 "FlickrPublishing.c"
 	}
 	goto __finally16;
 	__catch16_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		gchar* _tmp11_;
-#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		gchar* _tmp9_;
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		err = _inner_error_;
-#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_inner_error_ = NULL;
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp11_ = g_strdup ("No error code specified");
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		result = _tmp11_;
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp9_ = g_strdup ("No error code specified");
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		result = _tmp9_;
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (err);
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (status);
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return result;
-#line 3600 "FlickrPublishing.c"
+#line 3562 "FlickrPublishing.c"
 	}
 	__finally16:
-#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (status);
-#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 460 "/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 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return NULL;
-#line 3613 "FlickrPublishing.c"
+#line 3575 "FlickrPublishing.c"
 	}
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp12_ = errcode;
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp13_ = (gchar*) xmlGetProp (_tmp12_, (xmlChar*) "msg");
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp14_ = _tmp13_;
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp15_ = errcode;
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp16_ = (gchar*) xmlGetProp (_tmp15_, (xmlChar*) "code");
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp10_ = errcode;
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp11_ = (gchar*) xmlGetProp (_tmp10_, (xmlChar*) "msg");
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp12_ = _tmp11_;
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp13_ = errcode;
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp14_ = (gchar*) xmlGetProp (_tmp13_, (xmlChar*) "code");
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp15_ = _tmp14_;
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp16_ = g_strdup_printf ("%s (error code %s)", _tmp12_, _tmp15_);
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp17_ = _tmp16_;
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp18_ = g_strdup_printf ("%s (error code %s)", _tmp14_, _tmp17_);
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp19_ = _tmp18_;
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp17_);
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp14_);
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	result = _tmp19_;
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_free0 (_tmp15_);
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_free0 (_tmp12_);
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	result = _tmp17_;
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (status);
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 3641 "FlickrPublishing.c"
+#line 3603 "FlickrPublishing.c"
 }
 
 
-static gchar* _publishing_flickr_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self) {
+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 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 3650 "FlickrPublishing.c"
+#line 3615 "FlickrPublishing.c"
 }
 
 
-static gboolean string_contains (const gchar* self, const gchar* needle) {
+static gboolean
+string_contains (const gchar* self,
+                 const gchar* needle)
+{
 	gboolean result = FALSE;
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = needle;
-#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	result = _tmp1_ != NULL;
-#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp0_ = strstr ((gchar*) self, (gchar*) needle);
+#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	result = _tmp0_ != NULL;
+#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	return result;
-#line 3670 "FlickrPublishing.c"
+#line 3635 "FlickrPublishing.c"
 }
 
 
-static gpointer _g_error_copy0 (gpointer self) {
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static gpointer
+_g_error_copy0 (gpointer self)
+{
+#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? g_error_copy (self) : NULL;
-#line 3677 "FlickrPublishing.c"
+#line 3644 "FlickrPublishing.c"
 }
 
 
-PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_response (const gchar* xml, GError** error) {
+PublishingRESTSupportXmlDocument*
+publishing_flickr_transaction_parse_flickr_response (const gchar* xml,
+                                                     GError** error)
+{
 	PublishingRESTSupportXmlDocument* result = NULL;
 	PublishingRESTSupportXmlDocument* _result_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 510 "/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 (xml != NULL, NULL);
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_result_ = NULL;
-#line 3689 "FlickrPublishing.c"
+#line 3659 "FlickrPublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* _tmp0_ = NULL;
-		const gchar* _tmp1_;
+		PublishingRESTSupportXmlDocument* _tmp1_;
 		PublishingRESTSupportXmlDocument* _tmp2_;
-		PublishingRESTSupportXmlDocument* _tmp3_;
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp1_ = xml;
-#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 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp0_ = _tmp2_;
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp1_ = publishing_rest_support_xml_document_parse_string (xml, _publishing_flickr_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp0_ = _tmp1_;
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3705 "FlickrPublishing.c"
+#line 3672 "FlickrPublishing.c"
 				goto __catch17_spit_publishing_publishing_error;
 			}
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (_result_);
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 484 "/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 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return NULL;
-#line 3716 "FlickrPublishing.c"
+#line 3683 "FlickrPublishing.c"
 		}
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp3_ = _tmp0_;
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp2_ = _tmp0_;
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp0_ = NULL;
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (_result_);
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_result_ = _tmp3_;
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_result_ = _tmp2_;
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (_tmp0_);
-#line 3728 "FlickrPublishing.c"
+#line 3695 "FlickrPublishing.c"
 	}
 	goto __finally17;
 	__catch17_spit_publishing_publishing_error:
 	{
 		GError* e = NULL;
-		GError* _tmp4_;
-		const gchar* _tmp5_;
+		GError* _tmp3_;
+		const gchar* _tmp4_;
+		gchar* _tmp5_;
 		gchar* _tmp6_;
-		gchar* _tmp7_;
-		gboolean _tmp8_;
-		gboolean _tmp9_;
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		gboolean _tmp7_;
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		e = _inner_error_;
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_inner_error_ = NULL;
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp4_ = e;
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp5_ = _tmp4_->message;
-#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 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp7_ = _tmp6_;
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp8_ = string_contains (_tmp5_, _tmp7_);
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp9_ = _tmp8_;
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_free0 (_tmp7_);
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		if (_tmp9_) {
-#line 3760 "FlickrPublishing.c"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp3_ = e;
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp4_ = _tmp3_->message;
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp5_ = g_strdup_printf ("(error code %s)", PUBLISHING_FLICKR_EXPIRED_SESSION_ERROR_CODE);
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp6_ = _tmp5_;
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp7_ = string_contains (_tmp4_, _tmp6_);
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_g_free0 (_tmp6_);
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		if (_tmp7_) {
+#line 3724 "FlickrPublishing.c"
+			GError* _tmp8_;
+			const gchar* _tmp9_;
 			GError* _tmp10_;
-			const gchar* _tmp11_;
-			GError* _tmp12_;
-#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_tmp10_ = e;
-#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_tmp11_ = _tmp10_->message;
-#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 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_inner_error_ = _tmp12_;
-#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			_tmp8_ = e;
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			_tmp9_ = _tmp8_->message;
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			_tmp10_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_EXPIRED_SESSION, _tmp9_);
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			_inner_error_ = _tmp10_;
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_error_free0 (e);
-#line 3774 "FlickrPublishing.c"
+#line 3738 "FlickrPublishing.c"
 			goto __finally17;
 		} else {
-			GError* _tmp13_;
-			GError* _tmp14_;
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_tmp13_ = e;
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_tmp14_ = _g_error_copy0 (_tmp13_);
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_inner_error_ = _tmp14_;
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			GError* _tmp11_;
+			GError* _tmp12_;
+#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			_tmp11_ = e;
+#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			_tmp12_ = _g_error_copy0 (_tmp11_);
+#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			_inner_error_ = _tmp12_;
+#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_error_free0 (e);
-#line 3787 "FlickrPublishing.c"
+#line 3751 "FlickrPublishing.c"
 			goto __finally17;
 		}
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (e);
-#line 3792 "FlickrPublishing.c"
+#line 3756 "FlickrPublishing.c"
 	}
 	__finally17:
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_propagate_error (error, _inner_error_);
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (_result_);
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return NULL;
-#line 3805 "FlickrPublishing.c"
+#line 3769 "FlickrPublishing.c"
 		} else {
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (_result_);
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 483 "/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 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return NULL;
-#line 3815 "FlickrPublishing.c"
+#line 3779 "FlickrPublishing.c"
 		}
 	}
-#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _result_;
-#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 3822 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_transaction_class_init (PublishingFlickrTransactionClass * klass) {
-#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_flickr_transaction_real_execute;
-#line 3831 "FlickrPublishing.c"
+#line 3786 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_transaction_instance_init (PublishingFlickrTransaction * self) {
-}
-
-
-GType publishing_flickr_transaction_get_type (void) {
-	static volatile gsize publishing_flickr_transaction_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_flickr_transaction_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (PublishingFlickrTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_flickr_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFlickrTransaction), 0, (GInstanceInitFunc) publishing_flickr_transaction_instance_init, NULL };
-		GType publishing_flickr_transaction_type_id;
-		publishing_flickr_transaction_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, "PublishingFlickrTransaction", &g_define_type_info, 0);
-		g_once_init_leave (&publishing_flickr_transaction_type_id__volatile, publishing_flickr_transaction_type_id);
-	}
-	return publishing_flickr_transaction_type_id__volatile;
-}
-
-
-PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetch_transaction_construct (GType object_type, PublishingFlickrSession* session) {
+PublishingFlickrAccountInfoFetchTransaction*
+publishing_flickr_account_info_fetch_transaction_construct (GType object_type,
+                                                            PublishingRESTSupportOAuth1Session* session)
+{
 	PublishingFlickrAccountInfoFetchTransaction* self = NULL;
-	PublishingFlickrSession* _tmp0_;
-	PublishingFlickrSession* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL);
-#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = session;
-#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 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (session), NULL);
+#line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self = (PublishingFlickrAccountInfoFetchTransaction*) publishing_rest_support_oauth1_transaction_construct (object_type, session, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
+#line 500 "/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 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = session;
-#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = publishing_flickr_session_get_access_phase_token (_tmp1_);
-#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = _tmp2_;
-#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 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp3_);
-#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 3877 "FlickrPublishing.c"
+#line 3803 "FlickrPublishing.c"
 }
 
 
-PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetch_transaction_new (PublishingFlickrSession* session) {
-#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+PublishingFlickrAccountInfoFetchTransaction*
+publishing_flickr_account_info_fetch_transaction_new (PublishingRESTSupportOAuth1Session* session)
+{
+#line 498 "/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 3884 "FlickrPublishing.c"
+#line 3812 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_account_info_fetch_transaction_class_init (PublishingFlickrAccountInfoFetchTransactionClass * klass) {
-#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+publishing_flickr_account_info_fetch_transaction_class_init (PublishingFlickrAccountInfoFetchTransactionClass * klass)
+{
+#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_account_info_fetch_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 3891 "FlickrPublishing.c"
+#line 3821 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_account_info_fetch_transaction_instance_init (PublishingFlickrAccountInfoFetchTransaction * self) {
+static void
+publishing_flickr_account_info_fetch_transaction_instance_init (PublishingFlickrAccountInfoFetchTransaction * self)
+{
 }
 
 
-GType publishing_flickr_account_info_fetch_transaction_get_type (void) {
+GType
+publishing_flickr_account_info_fetch_transaction_get_type (void)
+{
 	static volatile gsize publishing_flickr_account_info_fetch_transaction_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_flickr_account_info_fetch_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingFlickrAccountInfoFetchTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_flickr_account_info_fetch_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFlickrAccountInfoFetchTransaction), 0, (GInstanceInitFunc) publishing_flickr_account_info_fetch_transaction_instance_init, NULL };
 		GType publishing_flickr_account_info_fetch_transaction_type_id;
-		publishing_flickr_account_info_fetch_transaction_type_id = g_type_register_static (PUBLISHING_FLICKR_TYPE_TRANSACTION, "PublishingFlickrAccountInfoFetchTransaction", &g_define_type_info, 0);
+		publishing_flickr_account_info_fetch_transaction_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_TRANSACTION, "PublishingFlickrAccountInfoFetchTransaction", &g_define_type_info, 0);
 		g_once_init_leave (&publishing_flickr_account_info_fetch_transaction_type_id__volatile, publishing_flickr_account_info_fetch_transaction_type_id);
 	}
 	return publishing_flickr_account_info_fetch_transaction_type_id__volatile;
 }
 
 
-static gpointer _publishing_flickr_publishing_parameters_ref0 (gpointer self) {
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static gpointer
+_publishing_flickr_publishing_parameters_ref0 (gpointer self)
+{
+#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? publishing_flickr_publishing_parameters_ref (self) : NULL;
-#line 3914 "FlickrPublishing.c"
-}
-
-
-static gpointer _publishing_rest_support_session_ref0 (gpointer self) {
-#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return self ? publishing_rest_support_session_ref (self) : NULL;
-#line 3921 "FlickrPublishing.c"
+#line 3850 "FlickrPublishing.c"
 }
 
 
-static void _g_free0_ (gpointer var) {
-#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+_g_free0_ (gpointer var)
+{
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	var = (g_free (var), NULL);
-#line 3928 "FlickrPublishing.c"
+#line 3859 "FlickrPublishing.c"
 }
 
 
-PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_construct (GType object_type, PublishingFlickrSession* session, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublishable* publishable) {
+PublishingFlickrUploadTransaction*
+publishing_flickr_upload_transaction_construct (GType object_type,
+                                                PublishingRESTSupportOAuth1Session* session,
+                                                PublishingFlickrPublishingParameters* parameters,
+                                                SpitPublishingPublishable* publishable)
+{
 	PublishingFlickrUploadTransaction* self = NULL;
-	PublishingFlickrSession* _tmp0_;
-	SpitPublishingPublishable* _tmp1_;
-	PublishingFlickrPublishingParameters* _tmp2_;
-	PublishingFlickrPublishingParameters* _tmp3_;
-	PublishingFlickrSession* _tmp4_;
-	PublishingFlickrSession* _tmp5_;
-	PublishingRESTSupportArgument** _tmp6_;
-	PublishingFlickrSession* _tmp7_;
+	PublishingFlickrPublishingParameters* _tmp0_;
+	PublishingFlickrVisibilitySpecification* _tmp1_;
+	gint _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	PublishingFlickrVisibilitySpecification* _tmp5_;
+	gint _tmp6_;
+	gchar* _tmp7_;
 	gchar* _tmp8_;
-	gchar* _tmp9_;
-	PublishingFlickrSession* _tmp10_;
+	PublishingFlickrVisibilitySpecification* _tmp9_;
+	gint _tmp10_;
 	gchar* _tmp11_;
 	gchar* _tmp12_;
-	PublishingFlickrSession* _tmp13_;
-	gchar* _tmp14_;
-	gchar* _tmp15_;
-	PublishingFlickrSession* _tmp16_;
-	gchar* _tmp17_;
-	gchar* _tmp18_;
-	PublishingFlickrPublishingParameters* _tmp19_;
-	PublishingFlickrVisibilitySpecification* _tmp20_;
-	gint _tmp21_;
+	GHashTable* disposition_table = NULL;
+	GHashFunc _tmp13_;
+	GEqualFunc _tmp14_;
+	GHashTable* _tmp15_;
+	gchar* filename = NULL;
+	gchar* _tmp16_;
+	gboolean _tmp17_ = FALSE;
+	const gchar* _tmp18_;
+	GHashTable* _tmp21_;
 	gchar* _tmp22_;
 	gchar* _tmp23_;
-	PublishingFlickrPublishingParameters* _tmp24_;
-	PublishingFlickrVisibilitySpecification* _tmp25_;
-	gint _tmp26_;
+	gchar* _tmp24_;
+	gchar* _tmp25_;
+	GHashTable* _tmp26_;
 	gchar* _tmp27_;
 	gchar* _tmp28_;
-	PublishingFlickrPublishingParameters* _tmp29_;
-	PublishingFlickrVisibilitySpecification* _tmp30_;
-	gint _tmp31_;
-	gchar* _tmp32_;
-	gchar* _tmp33_;
-	GHashTable* disposition_table = NULL;
-	GHashFunc _tmp34_;
-	GEqualFunc _tmp35_;
-	GHashTable* _tmp36_;
-	gchar* filename = NULL;
-	SpitPublishingPublishable* _tmp37_;
-	gchar* _tmp38_;
-	gboolean _tmp39_ = FALSE;
-	const gchar* _tmp40_;
-	GHashTable* _tmp44_;
-	gchar* _tmp45_;
-	SpitPublishingPublishable* _tmp46_;
-	gchar* _tmp47_;
-	gchar* _tmp48_;
-	gchar* _tmp49_;
-	GHashTable* _tmp50_;
-	gchar* _tmp51_;
-	gchar* _tmp52_;
-	GHashTable* _tmp53_;
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL);
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	GHashTable* _tmp29_;
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (session), NULL);
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_PARAMETERS (parameters), NULL);
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = session;
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = publishable;
-#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 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = parameters;
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = _publishing_flickr_publishing_parameters_ref0 (_tmp2_);
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self = (PublishingFlickrUploadTransaction*) publishing_rest_support_oauth1_upload_transaction_construct (object_type, session, publishable, "https://api.flickr.com/services/upload");
+#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp0_ = _publishing_flickr_publishing_parameters_ref0 (parameters);
+#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->parameters = _tmp3_;
-#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = session;
-#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = _publishing_rest_support_session_ref0 (_tmp4_);
-#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->session = _tmp5_;
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6_ = g_new0 (PublishingRESTSupportArgument*, 0 + 1);
-#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 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->auth_header_fields = _tmp6_;
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->auth_header_fields_length1 = 0;
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->_auth_header_fields_size_ = self->priv->auth_header_fields_length1;
-#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp7_ = session;
-#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp8_ = publishing_flickr_session_get_oauth_nonce (_tmp7_);
-#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp9_ = _tmp8_;
-#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_nonce", _tmp9_);
-#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp9_);
-#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 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_version", "1.0");
-#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_callback", "oob");
-#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp10_ = session;
-#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp11_ = publishing_flickr_session_get_oauth_timestamp (_tmp10_);
-#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->parameters = _tmp0_;
+#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp1_ = parameters->visibility_specification;
+#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp2_ = _tmp1_->everyone_level;
+#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp3_ = g_strdup_printf ("%d", _tmp2_);
+#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp4_ = _tmp3_;
+#line 513 "/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", _tmp4_);
+#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_free0 (_tmp4_);
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp5_ = parameters->visibility_specification;
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp6_ = _tmp5_->friends_level;
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp7_ = g_strdup_printf ("%d", _tmp6_);
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp8_ = _tmp7_;
+#line 514 "/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", _tmp8_);
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_free0 (_tmp8_);
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp9_ = parameters->visibility_specification;
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp10_ = _tmp9_->family_level;
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp11_ = g_strdup_printf ("%d", _tmp10_);
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp12_ = _tmp11_;
-#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_timestamp", _tmp12_);
-#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 515 "/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", _tmp12_);
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp12_);
-#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp13_ = session;
-#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 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 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 4133 "FlickrPublishing.c"
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp13_ = g_str_hash;
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp14_ = g_str_equal;
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp15_ = g_hash_table_new_full (_tmp13_, _tmp14_, _g_free0_, _g_free0_);
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	disposition_table = _tmp15_;
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp16_ = spit_publishing_publishable_get_publishing_name (publishable);
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	filename = _tmp16_;
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp18_ = filename;
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (_tmp18_ == NULL) {
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp17_ = TRUE;
+#line 3968 "FlickrPublishing.c"
 	} else {
-		const gchar* _tmp41_;
-#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 4140 "FlickrPublishing.c"
+		const gchar* _tmp19_;
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp19_ = filename;
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp17_ = g_strcmp0 (_tmp19_, "") == 0;
+#line 3975 "FlickrPublishing.c"
 	}
-#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp39_) {
-#line 4144 "FlickrPublishing.c"
-		SpitPublishingPublishable* _tmp42_;
-		gchar* _tmp43_;
-#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"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (_tmp17_) {
+#line 3979 "FlickrPublishing.c"
+		gchar* _tmp20_;
+#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp20_ = spit_publishing_publishable_get_param_string (publishable, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
+#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (filename);
-#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		filename = _tmp43_;
-#line 4155 "FlickrPublishing.c"
-	}
-#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 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"
+#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		filename = _tmp20_;
+#line 3987 "FlickrPublishing.c"
+	}
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp21_ = disposition_table;
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp22_ = g_strdup ("filename");
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp23_ = spit_publishing_publishable_get_param_string (publishable, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp24_ = _tmp23_;
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp25_ = soup_uri_encode (_tmp24_, NULL);
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_hash_table_insert (_tmp21_, _tmp22_, _tmp25_);
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_free0 (_tmp24_);
+#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp26_ = disposition_table;
+#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp27_ = g_strdup ("name");
+#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp28_ = g_strdup ("photo");
+#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_hash_table_insert (_tmp26_, _tmp27_, _tmp28_);
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp29_ = disposition_table;
+#line 530 "/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), _tmp29_);
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (filename);
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_hash_table_unref0 (disposition_table);
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 4191 "FlickrPublishing.c"
+#line 4021 "FlickrPublishing.c"
 }
 
 
-PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_new (PublishingFlickrSession* session, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublishable* publishable) {
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+PublishingFlickrUploadTransaction*
+publishing_flickr_upload_transaction_new (PublishingRESTSupportOAuth1Session* session,
+                                          PublishingFlickrPublishingParameters* parameters,
+                                          SpitPublishingPublishable* publishable)
+{
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_upload_transaction_construct (PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION, session, parameters, publishable);
-#line 4198 "FlickrPublishing.c"
-}
-
-
-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 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		*array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1);
-#line 4209 "FlickrPublishing.c"
-	}
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	(*array)[(*length)++] = value;
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	(*array)[*length] = NULL;
-#line 4215 "FlickrPublishing.c"
-}
-
-
-void publishing_flickr_upload_transaction_add_authorization_header_field (PublishingFlickrUploadTransaction* self, const gchar* key, const gchar* value) {
-	PublishingRESTSupportArgument** _tmp0_;
-	gint _tmp0__length1;
-	const gchar* _tmp1_;
-	const gchar* _tmp2_;
-	PublishingRESTSupportArgument* _tmp3_;
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_UPLOAD_TRANSACTION (self));
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (key != NULL);
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (value != NULL);
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->auth_header_fields;
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0__length1 = self->priv->auth_header_fields_length1;
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = key;
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = value;
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = publishing_rest_support_argument_new (_tmp1_, _tmp2_);
-#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 4243 "FlickrPublishing.c"
-}
-
-
-static gpointer _publishing_rest_support_argument_ref0 (gpointer self) {
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return self ? publishing_rest_support_argument_ref (self) : NULL;
-#line 4250 "FlickrPublishing.c"
-}
-
-
-static PublishingRESTSupportArgument** _vala_array_dup8 (PublishingRESTSupportArgument** self, int length) {
-	PublishingRESTSupportArgument** result;
-	int i;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	result = g_new0 (PublishingRESTSupportArgument*, length + 1);
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	for (i = 0; i < length; i++) {
-#line 4261 "FlickrPublishing.c"
-		PublishingRESTSupportArgument* _tmp0_;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp0_ = _publishing_rest_support_argument_ref0 (self[i]);
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		result[i] = _tmp0_;
-#line 4267 "FlickrPublishing.c"
-	}
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return result;
-#line 4271 "FlickrPublishing.c"
+#line 4032 "FlickrPublishing.c"
 }
 
 
-PublishingRESTSupportArgument** publishing_flickr_upload_transaction_get_authorization_header_fields (PublishingFlickrUploadTransaction* self, int* result_length1) {
-	PublishingRESTSupportArgument** result = NULL;
-	PublishingRESTSupportArgument** _tmp0_;
-	gint _tmp0__length1;
-	PublishingRESTSupportArgument** _tmp1_;
-	gint _tmp1__length1;
-	PublishingRESTSupportArgument** _tmp2_;
-	gint _tmp2__length1;
-#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FLICKR_IS_UPLOAD_TRANSACTION (self), NULL);
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->auth_header_fields;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0__length1 = self->priv->auth_header_fields_length1;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup8 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1__length1 = _tmp0__length1;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = _tmp1_;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2__length1 = _tmp1__length1;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (result_length1) {
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		*result_length1 = _tmp2__length1;
-#line 4301 "FlickrPublishing.c"
-	}
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	result = _tmp2_;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return result;
-#line 4307 "FlickrPublishing.c"
-}
-
-
-gchar* publishing_flickr_upload_transaction_get_authorization_header_string (PublishingFlickrUploadTransaction* self) {
-	gchar* result = NULL;
-	gchar* _result_ = NULL;
-	gchar* _tmp0_;
-#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FLICKR_IS_UPLOAD_TRANSACTION (self), NULL);
-#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = g_strdup ("OAuth ");
-#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_result_ = _tmp0_;
-#line 4321 "FlickrPublishing.c"
-	{
-		gint i = 0;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		i = 0;
-#line 4326 "FlickrPublishing.c"
-		{
-			gboolean _tmp1_ = FALSE;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_tmp1_ = TRUE;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			while (TRUE) {
-#line 4333 "FlickrPublishing.c"
-				gint _tmp3_;
-				PublishingRESTSupportArgument** _tmp4_;
-				gint _tmp4__length1;
-				const gchar* _tmp5_;
-				PublishingRESTSupportArgument** _tmp6_;
-				gint _tmp6__length1;
-				gint _tmp7_;
-				PublishingRESTSupportArgument* _tmp8_;
-				const gchar* _tmp9_;
-				gchar* _tmp10_;
-				const gchar* _tmp11_;
-				gchar* _tmp12_;
-				const gchar* _tmp13_;
-				PublishingRESTSupportArgument** _tmp14_;
-				gint _tmp14__length1;
-				gint _tmp15_;
-				PublishingRESTSupportArgument* _tmp16_;
-				const gchar* _tmp17_;
-				gchar* _tmp18_;
-				gchar* _tmp19_;
-				gchar* _tmp20_;
-				gchar* _tmp21_;
-				gchar* _tmp22_;
-				gint _tmp23_;
-				PublishingRESTSupportArgument** _tmp24_;
-				gint _tmp24__length1;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				if (!_tmp1_) {
-#line 4362 "FlickrPublishing.c"
-					gint _tmp2_;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_tmp2_ = i;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					i = _tmp2_ + 1;
-#line 4368 "FlickrPublishing.c"
-				}
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp1_ = FALSE;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp3_ = i;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp4_ = self->priv->auth_header_fields;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp4__length1 = self->priv->auth_header_fields_length1;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				if (!(_tmp3_ < _tmp4__length1)) {
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					break;
-#line 4382 "FlickrPublishing.c"
-				}
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp5_ = _result_;
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp6_ = self->priv->auth_header_fields;
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp6__length1 = self->priv->auth_header_fields_length1;
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp7_ = i;
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp8_ = _tmp6_[_tmp7_];
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp9_ = _tmp8_->key;
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp10_ = g_strconcat (_tmp5_, _tmp9_, NULL);
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_g_free0 (_result_);
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_result_ = _tmp10_;
-#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp11_ = _result_;
-#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp12_ = g_strconcat (_tmp11_, "=", NULL);
-#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_g_free0 (_result_);
-#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_result_ = _tmp12_;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp13_ = _result_;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp14_ = self->priv->auth_header_fields;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp14__length1 = self->priv->auth_header_fields_length1;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp15_ = i;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp16_ = _tmp14_[_tmp15_];
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp17_ = _tmp16_->value;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp18_ = g_strconcat ("\"", _tmp17_, NULL);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp19_ = _tmp18_;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp20_ = g_strconcat (_tmp19_, "\"", NULL);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp21_ = _tmp20_;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp22_ = g_strconcat (_tmp13_, _tmp21_, NULL);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_g_free0 (_result_);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_result_ = _tmp22_;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_g_free0 (_tmp21_);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_g_free0 (_tmp19_);
-#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp23_ = i;
-#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp24_ = self->priv->auth_header_fields;
-#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp24__length1 = self->priv->auth_header_fields_length1;
-#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				if (_tmp23_ < (_tmp24__length1 - 1)) {
-#line 4448 "FlickrPublishing.c"
-					const gchar* _tmp25_;
-					gchar* _tmp26_;
-#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_tmp25_ = _result_;
-#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_tmp26_ = g_strconcat (_tmp25_, ", ", NULL);
-#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_g_free0 (_result_);
-#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_result_ = _tmp26_;
-#line 4459 "FlickrPublishing.c"
-				}
-			}
-		}
-	}
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	result = _result_;
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return result;
-#line 4468 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) {
+static void
+publishing_flickr_upload_transaction_real_execute (PublishingRESTSupportTransaction* base,
+                                                   GError** error)
+{
 	PublishingFlickrUploadTransaction * self;
-	PublishingFlickrSession* _tmp0_;
-	gchar* authorization_header = NULL;
-	gchar* _tmp1_;
 	GError * _inner_error_ = NULL;
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION, PublishingFlickrUploadTransaction);
-#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->session;
-#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 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = publishing_flickr_upload_transaction_get_authorization_header_string (self);
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	authorization_header = _tmp1_;
-#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 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 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 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	publishing_rest_support_oauth1_upload_transaction_authorize (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportOAuth1UploadTransaction));
+#line 535 "/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_OAUTH1_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportOAuth1UploadTransaction), PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_propagate_error (error, _inner_error_);
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_g_free0 (authorization_header);
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 4504 "FlickrPublishing.c"
+#line 4056 "FlickrPublishing.c"
 		} else {
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_g_free0 (authorization_header);
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 535 "/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 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 4514 "FlickrPublishing.c"
+#line 4064 "FlickrPublishing.c"
 		}
 	}
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (authorization_header);
-#line 4519 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_upload_transaction_class_init (PublishingFlickrUploadTransactionClass * klass) {
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+publishing_flickr_upload_transaction_class_init (PublishingFlickrUploadTransactionClass * klass)
+{
+#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_upload_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_flickr_upload_transaction_finalize;
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFlickrUploadTransactionPrivate));
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_flickr_upload_transaction_real_execute;
-#line 4532 "FlickrPublishing.c"
+#line 4081 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_upload_transaction_instance_init (PublishingFlickrUploadTransaction * self) {
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+publishing_flickr_upload_transaction_instance_init (PublishingFlickrUploadTransaction * self)
+{
+#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv = PUBLISHING_FLICKR_UPLOAD_TRANSACTION_GET_PRIVATE (self);
-#line 4539 "FlickrPublishing.c"
+#line 4090 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_upload_transaction_finalize (PublishingRESTSupportTransaction * obj) {
+static void
+publishing_flickr_upload_transaction_finalize (PublishingRESTSupportTransaction * obj)
+{
 	PublishingFlickrUploadTransaction * self;
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION, PublishingFlickrUploadTransaction);
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
-#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_publishing_rest_support_session_unref0 (self->priv->session);
-#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 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_flickr_upload_transaction_parent_class)->finalize (obj);
-#line 4555 "FlickrPublishing.c"
+#line 4104 "FlickrPublishing.c"
 }
 
 
-GType publishing_flickr_upload_transaction_get_type (void) {
+GType
+publishing_flickr_upload_transaction_get_type (void)
+{
 	static volatile gsize publishing_flickr_upload_transaction_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_flickr_upload_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingFlickrUploadTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_flickr_upload_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFlickrUploadTransaction), 0, (GInstanceInitFunc) publishing_flickr_upload_transaction_instance_init, NULL };
 		GType publishing_flickr_upload_transaction_type_id;
-		publishing_flickr_upload_transaction_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, "PublishingFlickrUploadTransaction", &g_define_type_info, 0);
+		publishing_flickr_upload_transaction_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION, "PublishingFlickrUploadTransaction", &g_define_type_info, 0);
 		g_once_init_leave (&publishing_flickr_upload_transaction_type_id__volatile, publishing_flickr_upload_transaction_type_id);
 	}
 	return publishing_flickr_upload_transaction_type_id__volatile;
 }
 
 
-PublishingFlickrSession* publishing_flickr_session_construct (GType object_type) {
-	PublishingFlickrSession* self = NULL;
-#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 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return self;
-#line 4577 "FlickrPublishing.c"
-}
-
-
-PublishingFlickrSession* publishing_flickr_session_new (void) {
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return publishing_flickr_session_construct (PUBLISHING_FLICKR_TYPE_SESSION);
-#line 4584 "FlickrPublishing.c"
-}
-
-
-static gboolean publishing_flickr_session_real_is_authenticated (PublishingRESTSupportSession* base) {
-	PublishingFlickrSession * self;
-	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	const gchar* _tmp2_;
-#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSession);
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = self->priv->access_phase_token;
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp2_ != NULL) {
-#line 4600 "FlickrPublishing.c"
-		const gchar* _tmp3_;
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp3_ = self->priv->access_phase_token_secret;
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp1_ = _tmp3_ != NULL;
-#line 4606 "FlickrPublishing.c"
-	} else {
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp1_ = FALSE;
-#line 4610 "FlickrPublishing.c"
-	}
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp1_) {
-#line 4614 "FlickrPublishing.c"
-		const gchar* _tmp4_;
-#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp4_ = self->priv->username;
-#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp0_ = _tmp4_ != NULL;
-#line 4620 "FlickrPublishing.c"
-	} else {
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp0_ = FALSE;
-#line 4624 "FlickrPublishing.c"
-	}
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	result = _tmp0_;
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return result;
-#line 4630 "FlickrPublishing.c"
-}
-
-
-void publishing_flickr_session_set_api_credentials (PublishingFlickrSession* self, const gchar* consumer_key, const gchar* consumer_secret) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-	const gchar* _tmp2_;
-	gchar* _tmp3_;
-#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_SESSION (self));
-#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 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 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 4661 "FlickrPublishing.c"
-}
-
-
-static gpointer _publishing_rest_support_transaction_ref0 (gpointer self) {
-#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return self ? publishing_rest_support_transaction_ref (self) : NULL;
-#line 4668 "FlickrPublishing.c"
-}
-
-
-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 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		*array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1);
-#line 4679 "FlickrPublishing.c"
-	}
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	(*array)[(*length)++] = value;
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	(*array)[*length] = NULL;
-#line 4685 "FlickrPublishing.c"
-}
-
-
-void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, PublishingRESTSupportTransaction* txn) {
-	gchar* http_method = NULL;
-	PublishingRESTSupportTransaction* _tmp0_;
-	PublishingRESTSupportHttpMethod _tmp1_;
-	gchar* _tmp2_;
-	const gchar* _tmp3_;
-	gchar* _tmp4_;
-	gchar* _tmp5_;
-	PublishingRESTSupportArgument** base_string_arguments = NULL;
-	PublishingRESTSupportTransaction* _tmp6_;
-	gint _tmp7_;
-	PublishingRESTSupportArgument** _tmp8_;
-	gint base_string_arguments_length1;
-	gint _base_string_arguments_size_;
-	PublishingFlickrUploadTransaction* upload_txn = NULL;
-	PublishingRESTSupportTransaction* _tmp9_;
-	PublishingFlickrUploadTransaction* _tmp10_;
-	PublishingFlickrUploadTransaction* _tmp11_;
-	PublishingRESTSupportArgument** sorted_args = NULL;
-	PublishingRESTSupportArgument** _tmp20_;
-	gint _tmp20__length1;
-	gint _tmp21_;
-	PublishingRESTSupportArgument** _tmp22_;
-	gint sorted_args_length1;
-	gint _sorted_args_size_;
-	gchar* arguments_string = NULL;
-	gchar* _tmp23_;
-	gchar* signing_key = NULL;
-	const gchar* _tmp46_;
-	gchar* signature_base_string = NULL;
-	const gchar* _tmp54_;
-	gchar* _tmp55_;
-	gchar* _tmp56_;
-	PublishingRESTSupportTransaction* _tmp57_;
-	gchar* _tmp58_;
-	gchar* _tmp59_;
-	gchar* _tmp60_;
-	gchar* _tmp61_;
-	gchar* _tmp62_;
-	gchar* _tmp63_;
-	gchar* _tmp64_;
-	gchar* _tmp65_;
-	const gchar* _tmp66_;
-	gchar* _tmp67_;
-	gchar* _tmp68_;
-	gchar* _tmp69_;
-	gchar* _tmp70_;
-	const gchar* _tmp71_;
-	const gchar* _tmp72_;
-	gchar* signature = NULL;
-	const gchar* _tmp73_;
-	const gchar* _tmp74_;
-	gchar* _tmp75_;
-	const gchar* _tmp76_;
-	gchar* _tmp77_;
-	const gchar* _tmp78_;
-	PublishingFlickrUploadTransaction* _tmp79_;
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_SESSION (self));
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = txn;
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = publishing_rest_support_transaction_get_method (_tmp0_);
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = publishing_rest_support_http_method_to_string (_tmp1_);
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	http_method = _tmp2_;
-#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 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = g_strconcat ("HTTP method = ", _tmp3_, NULL);
-#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = _tmp4_;
-#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 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6_ = txn;
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp8_ = publishing_rest_support_transaction_get_arguments (_tmp6_, &_tmp7_);
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	base_string_arguments = _tmp8_;
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	base_string_arguments_length1 = _tmp7_;
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_base_string_arguments_size_ = base_string_arguments_length1;
-#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp9_ = txn;
-#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 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	upload_txn = _tmp10_;
-#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp11_ = upload_txn;
-#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp11_ != NULL) {
-#line 4790 "FlickrPublishing.c"
-		PublishingRESTSupportArgument** auth_header_args = NULL;
-		PublishingFlickrUploadTransaction* _tmp12_;
-		gint _tmp13_;
-		PublishingRESTSupportArgument** _tmp14_;
-		gint auth_header_args_length1;
-		gint _auth_header_args_size_;
-		PublishingRESTSupportArgument** _tmp15_;
-		gint _tmp15__length1;
-#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 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp12_ = upload_txn;
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp14_ = publishing_flickr_upload_transaction_get_authorization_header_fields (_tmp12_, &_tmp13_);
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		auth_header_args = _tmp14_;
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		auth_header_args_length1 = _tmp13_;
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_auth_header_args_size_ = auth_header_args_length1;
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp15_ = auth_header_args;
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp15__length1 = auth_header_args_length1;
-#line 4815 "FlickrPublishing.c"
-		{
-			PublishingRESTSupportArgument** arg_collection = NULL;
-			gint arg_collection_length1 = 0;
-			gint _arg_collection_size_ = 0;
-			gint arg_it = 0;
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			arg_collection = _tmp15_;
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			arg_collection_length1 = _tmp15__length1;
-#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 4827 "FlickrPublishing.c"
-				PublishingRESTSupportArgument* _tmp16_;
-				PublishingRESTSupportArgument* arg = NULL;
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp16_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				arg = _tmp16_;
-#line 4834 "FlickrPublishing.c"
-				{
-					PublishingRESTSupportArgument** _tmp17_;
-					gint _tmp17__length1;
-					PublishingRESTSupportArgument* _tmp18_;
-					PublishingRESTSupportArgument* _tmp19_;
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_tmp17_ = base_string_arguments;
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_tmp17__length1 = base_string_arguments_length1;
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_tmp18_ = arg;
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_tmp19_ = _publishing_rest_support_argument_ref0 (_tmp18_);
-#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 4852 "FlickrPublishing.c"
-				}
-			}
-		}
-#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 4858 "FlickrPublishing.c"
-	}
-#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp20_ = base_string_arguments;
-#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp20__length1 = base_string_arguments_length1;
-#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp22_ = publishing_rest_support_argument_sort (_tmp20_, _tmp20__length1, &_tmp21_);
-#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	sorted_args = _tmp22_;
-#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	sorted_args_length1 = _tmp21_;
-#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_sorted_args_size_ = sorted_args_length1;
-#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp23_ = g_strdup ("");
-#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	arguments_string = _tmp23_;
-#line 4876 "FlickrPublishing.c"
-	{
-		gint i = 0;
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		i = 0;
-#line 4881 "FlickrPublishing.c"
-		{
-			gboolean _tmp24_ = FALSE;
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_tmp24_ = TRUE;
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			while (TRUE) {
-#line 4888 "FlickrPublishing.c"
-				gint _tmp26_;
-				PublishingRESTSupportArgument** _tmp27_;
-				gint _tmp27__length1;
-				const gchar* _tmp28_;
-				PublishingRESTSupportArgument** _tmp29_;
-				gint _tmp29__length1;
-				gint _tmp30_;
-				PublishingRESTSupportArgument* _tmp31_;
-				const gchar* _tmp32_;
-				gchar* _tmp33_;
-				gchar* _tmp34_;
-				PublishingRESTSupportArgument** _tmp35_;
-				gint _tmp35__length1;
-				gint _tmp36_;
-				PublishingRESTSupportArgument* _tmp37_;
-				const gchar* _tmp38_;
-				gchar* _tmp39_;
-				gchar* _tmp40_;
-				gchar* _tmp41_;
-				gint _tmp42_;
-				PublishingRESTSupportArgument** _tmp43_;
-				gint _tmp43__length1;
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				if (!_tmp24_) {
-#line 4913 "FlickrPublishing.c"
-					gint _tmp25_;
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_tmp25_ = i;
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					i = _tmp25_ + 1;
-#line 4919 "FlickrPublishing.c"
-				}
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp24_ = FALSE;
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp26_ = i;
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp27_ = sorted_args;
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp27__length1 = sorted_args_length1;
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				if (!(_tmp26_ < _tmp27__length1)) {
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					break;
-#line 4933 "FlickrPublishing.c"
-				}
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp28_ = arguments_string;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp29_ = sorted_args;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp29__length1 = sorted_args_length1;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp30_ = i;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp31_ = _tmp29_[_tmp30_];
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp32_ = _tmp31_->key;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp33_ = g_strconcat (_tmp32_, "=", NULL);
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp34_ = _tmp33_;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp35_ = sorted_args;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp35__length1 = sorted_args_length1;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp36_ = i;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp37_ = _tmp35_[_tmp36_];
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp38_ = _tmp37_->value;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp39_ = g_strconcat (_tmp34_, _tmp38_, NULL);
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp40_ = _tmp39_;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp41_ = g_strconcat (_tmp28_, _tmp40_, NULL);
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_g_free0 (arguments_string);
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				arguments_string = _tmp41_;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_g_free0 (_tmp40_);
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_g_free0 (_tmp34_);
-#line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp42_ = i;
-#line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp43_ = sorted_args;
-#line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp43__length1 = sorted_args_length1;
-#line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				if (_tmp42_ < (_tmp43__length1 - 1)) {
-#line 4983 "FlickrPublishing.c"
-					const gchar* _tmp44_;
-					gchar* _tmp45_;
-#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_tmp44_ = arguments_string;
-#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_tmp45_ = g_strconcat (_tmp44_, "&", NULL);
-#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_g_free0 (arguments_string);
-#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					arguments_string = _tmp45_;
-#line 4994 "FlickrPublishing.c"
-				}
-			}
-		}
-	}
-#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	signing_key = NULL;
-#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp46_ = self->priv->access_phase_token_secret;
-#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp46_ != NULL) {
-#line 5005 "FlickrPublishing.c"
-		const gchar* _tmp47_;
-		gchar* _tmp48_;
-		gchar* _tmp49_;
-		const gchar* _tmp50_;
-		gchar* _tmp51_;
-#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 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 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 5029 "FlickrPublishing.c"
-	} else {
-		const gchar* _tmp52_;
-		gchar* _tmp53_;
-#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 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 5043 "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 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 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 5125 "FlickrPublishing.c"
-		PublishingFlickrUploadTransaction* _tmp80_;
-		const gchar* _tmp81_;
-#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 5134 "FlickrPublishing.c"
-	} else {
-		PublishingRESTSupportTransaction* _tmp82_;
-		const gchar* _tmp83_;
-#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 5144 "FlickrPublishing.c"
-	}
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (signature);
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (signature_base_string);
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (signing_key);
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (arguments_string);
-#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 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_publishing_rest_support_transaction_unref0 (upload_txn);
-#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 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (http_method);
-#line 5162 "FlickrPublishing.c"
-}
-
-
-void publishing_flickr_session_set_access_phase_credentials (PublishingFlickrSession* self, const gchar* token, const gchar* secret, const gchar* username) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-	const gchar* _tmp2_;
-	gchar* _tmp3_;
-	const gchar* _tmp4_;
-	gchar* _tmp5_;
-#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_SESSION (self));
-#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (token != NULL);
-#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (secret != NULL);
-#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (username != NULL);
-#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = token;
-#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (self->priv->access_phase_token);
-#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->access_phase_token = _tmp1_;
-#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = secret;
-#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = g_strdup (_tmp2_);
-#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (self->priv->access_phase_token_secret);
-#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->access_phase_token_secret = _tmp3_;
-#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = username;
-#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = g_strdup (_tmp4_);
-#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (self->priv->username);
-#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->username = _tmp5_;
-#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 5207 "FlickrPublishing.c"
-}
-
-
-gchar* publishing_flickr_session_get_oauth_nonce (PublishingFlickrSession* self) {
-	gchar* result = NULL;
-	GTimeVal currtime = {0};
-	GTimeVal _tmp0_;
-	glong _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	GTimeVal _tmp4_;
-	glong _tmp5_;
-	gchar* _tmp6_;
-	gchar* _tmp7_;
-	gchar* _tmp8_;
-	gchar* _tmp9_;
-	gchar* _tmp10_;
-	gchar* _tmp11_;
-#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL);
-#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_get_current_time (&currtime);
-#line 706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_get_current_time (&currtime);
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = currtime;
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = _tmp0_.tv_sec;
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = g_strdup_printf ("%li", _tmp1_);
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = _tmp2_;
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = currtime;
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = _tmp4_.tv_usec;
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6_ = g_strdup_printf ("%li", _tmp5_);
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp7_ = _tmp6_;
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp8_ = g_strconcat (_tmp3_, _tmp7_, NULL);
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp9_ = _tmp8_;
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp10_ = g_compute_checksum_for_string (G_CHECKSUM_MD5, _tmp9_, (gsize) -1);
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp11_ = _tmp10_;
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp9_);
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp7_);
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp3_);
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	result = _tmp11_;
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return result;
-#line 5266 "FlickrPublishing.c"
-}
-
-
-static glong string_strnlen (gchar* str, glong maxlen) {
-	glong result = 0L;
-	gchar* end = NULL;
-	gchar* _tmp0_;
-	glong _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = str;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = maxlen;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	end = _tmp2_;
-#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp3_ = end;
-#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp3_ == NULL) {
-#line 5289 "FlickrPublishing.c"
-		glong _tmp4_;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4_ = maxlen;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = _tmp4_;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		return result;
-#line 5297 "FlickrPublishing.c"
-	} else {
-		gchar* _tmp5_;
-		gchar* _tmp6_;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp5_ = end;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp6_ = str;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = (glong) (_tmp5_ - _tmp6_);
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		return result;
-#line 5309 "FlickrPublishing.c"
-	}
-}
-
-
-static gchar* string_substring (const gchar* self, glong offset, glong len) {
-	gchar* result = NULL;
-	glong string_length = 0L;
-	gboolean _tmp0_ = FALSE;
-	glong _tmp1_;
-	glong _tmp8_;
-	glong _tmp14_;
-	glong _tmp17_;
-	glong _tmp18_;
-	glong _tmp19_;
-	glong _tmp20_;
-	glong _tmp21_;
-	gchar* _tmp22_;
-#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = offset;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp1_ >= ((glong) 0)) {
-#line 5333 "FlickrPublishing.c"
-		glong _tmp2_;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp2_ = len;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 5339 "FlickrPublishing.c"
-	} else {
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp0_ = FALSE;
-#line 5343 "FlickrPublishing.c"
-	}
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp0_) {
-#line 5347 "FlickrPublishing.c"
-		glong _tmp3_;
-		glong _tmp4_;
-		glong _tmp5_;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp3_ = offset;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4_ = len;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		string_length = _tmp5_;
-#line 5359 "FlickrPublishing.c"
-	} else {
-		gint _tmp6_;
-		gint _tmp7_;
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp6_ = strlen (self);
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp7_ = _tmp6_;
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		string_length = (glong) _tmp7_;
-#line 5369 "FlickrPublishing.c"
-	}
-#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp8_ = offset;
-#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp8_ < ((glong) 0)) {
-#line 5375 "FlickrPublishing.c"
-		glong _tmp9_;
-		glong _tmp10_;
-		glong _tmp11_;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp9_ = string_length;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp10_ = offset;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		offset = _tmp9_ + _tmp10_;
-#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp11_ = offset;
-#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 5389 "FlickrPublishing.c"
-	} else {
-		glong _tmp12_;
-		glong _tmp13_;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp12_ = offset;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp13_ = string_length;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 5399 "FlickrPublishing.c"
-	}
-#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp14_ = len;
-#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp14_ < ((glong) 0)) {
-#line 5405 "FlickrPublishing.c"
-		glong _tmp15_;
-		glong _tmp16_;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp15_ = string_length;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp16_ = offset;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		len = _tmp15_ - _tmp16_;
-#line 5414 "FlickrPublishing.c"
-	}
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp17_ = offset;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp18_ = len;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp19_ = string_length;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp20_ = offset;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp21_ = len;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	result = _tmp22_;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	return result;
-#line 5434 "FlickrPublishing.c"
-}
-
-
-gchar* publishing_flickr_session_get_oauth_timestamp (PublishingFlickrSession* self) {
-	gchar* result = NULL;
-	gint64 _tmp0_;
-	gchar* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	gchar* _tmp4_;
-#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL);
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = g_get_real_time ();
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp0_);
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = _tmp1_;
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = string_substring (_tmp2_, (glong) 0, (glong) 10);
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = _tmp3_;
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp2_);
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	result = _tmp4_;
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return result;
-#line 5463 "FlickrPublishing.c"
-}
-
-
-gchar* publishing_flickr_session_get_consumer_key (PublishingFlickrSession* self) {
-	gchar* result = NULL;
-	const gchar* _tmp0_;
-	const gchar* _tmp1_;
-	gchar* _tmp2_;
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL);
-#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 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	result = _tmp2_;
-#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return result;
-#line 5486 "FlickrPublishing.c"
-}
-
-
-gchar* publishing_flickr_session_get_access_phase_token (PublishingFlickrSession* self) {
-	gchar* result = NULL;
-	const gchar* _tmp0_;
-	const gchar* _tmp1_;
-	gchar* _tmp2_;
-#line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL);
-#line 722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->access_phase_token;
-#line 722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_assert (_tmp0_ != NULL, "access_phase_token != null");
-#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = self->priv->access_phase_token;
-#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = g_strdup (_tmp1_);
-#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	result = _tmp2_;
-#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return result;
-#line 5509 "FlickrPublishing.c"
-}
-
-
-gchar* publishing_flickr_session_get_username (PublishingFlickrSession* self) {
-	gchar* result = NULL;
-	gboolean _tmp0_;
-	const gchar* _tmp1_;
-	gchar* _tmp2_;
-#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL);
-#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 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_assert (_tmp0_, "is_authenticated()");
-#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = self->priv->username;
-#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = g_strdup (_tmp1_);
-#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	result = _tmp2_;
-#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return result;
-#line 5532 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_session_class_init (PublishingFlickrSessionClass * klass) {
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_session_parent_class = g_type_class_peek_parent (klass);
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	((PublishingRESTSupportSessionClass *) klass)->finalize = publishing_flickr_session_finalize;
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_type_class_add_private (klass, sizeof (PublishingFlickrSessionPrivate));
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_flickr_session_real_is_authenticated;
-#line 5545 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_session_instance_init (PublishingFlickrSession * self) {
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv = PUBLISHING_FLICKR_SESSION_GET_PRIVATE (self);
-#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->access_phase_token = NULL;
-#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->access_phase_token_secret = NULL;
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->username = NULL;
-#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 5562 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_session_finalize (PublishingRESTSupportSession * obj) {
-	PublishingFlickrSession * self;
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSession);
-#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (self->priv->access_phase_token);
-#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (self->priv->access_phase_token_secret);
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (self->priv->username);
-#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 5582 "FlickrPublishing.c"
-}
-
-
-GType publishing_flickr_session_get_type (void) {
-	static volatile gsize publishing_flickr_session_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_flickr_session_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (PublishingFlickrSessionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_flickr_session_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFlickrSession), 0, (GInstanceInitFunc) publishing_flickr_session_instance_init, NULL };
-		GType publishing_flickr_session_type_id;
-		publishing_flickr_session_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_TYPE_SESSION, "PublishingFlickrSession", &g_define_type_info, 0);
-		g_once_init_leave (&publishing_flickr_session_type_id__volatile, publishing_flickr_session_type_id);
-	}
-	return publishing_flickr_session_type_id__volatile;
-}
-
-
-static void _publishing_flickr_publishing_options_pane_on_visibility_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+_publishing_flickr_publishing_options_pane_on_visibility_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+                                                                                        gpointer self)
+{
+#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_on_visibility_changed ((PublishingFlickrPublishingOptionsPane*) self);
-#line 5601 "FlickrPublishing.c"
+#line 4128 "FlickrPublishing.c"
 }
 
 
-static void _publishing_flickr_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+_publishing_flickr_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+                                                                                  gpointer self)
+{
+#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_on_size_changed ((PublishingFlickrPublishingOptionsPane*) self);
-#line 5608 "FlickrPublishing.c"
+#line 4138 "FlickrPublishing.c"
 }
 
 
-static void _publishing_flickr_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+_publishing_flickr_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                 gpointer self)
+{
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_on_logout_clicked ((PublishingFlickrPublishingOptionsPane*) self);
-#line 5615 "FlickrPublishing.c"
+#line 4148 "FlickrPublishing.c"
 }
 
 
-static void _publishing_flickr_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+_publishing_flickr_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                  gpointer self)
+{
+#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_on_publish_clicked ((PublishingFlickrPublishingOptionsPane*) self);
-#line 5622 "FlickrPublishing.c"
+#line 4158 "FlickrPublishing.c"
 }
 
 
-PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane_construct (GType object_type, 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)
+{
 	PublishingFlickrPublishingOptionsPane * self = NULL;
 	GtkBuilder* _tmp0_;
-	GtkBuilder* _tmp1_;
-	GtkBuilder* _tmp2_;
+	GSList* _tmp1_;
+	GSList* _tmp2_;
 	GtkBuilder* _tmp3_;
-	GSList* _tmp4_;
-	GSList* _tmp5_;
-	guint _tmp6_;
-	GtkBuilder* _tmp7_;
-	GObject* _tmp8_;
-	GtkBox* _tmp9_;
-	GtkBuilder* _tmp10_;
-	GObject* _tmp11_;
-	GtkLabel* _tmp12_;
-	GtkBuilder* _tmp13_;
-	GObject* _tmp14_;
-	GtkLabel* _tmp15_;
-	GtkBuilder* _tmp16_;
-	GObject* _tmp17_;
-	GtkButton* _tmp18_;
-	GtkBuilder* _tmp19_;
-	GObject* _tmp20_;
-	GtkButton* _tmp21_;
-	GtkBuilder* _tmp22_;
-	GObject* _tmp23_;
-	GtkComboBoxText* _tmp24_;
-	GtkBuilder* _tmp25_;
-	GObject* _tmp26_;
-	GtkComboBoxText* _tmp27_;
-	GtkBuilder* _tmp28_;
-	GObject* _tmp29_;
-	GtkLabel* _tmp30_;
-	GtkBuilder* _tmp31_;
-	GObject* _tmp32_;
-	GtkCheckButton* _tmp33_;
-	PublishingFlickrFlickrPublisher* _tmp34_;
-	SpitPublishingAuthenticator* _tmp35_;
-	SpitPublishingAuthenticator* _tmp36_;
-	gboolean _tmp37_;
-	gboolean _tmp38_;
-	PublishingFlickrPublishingParameters* _tmp43_;
-	PublishingFlickrPublishingParameters* _tmp44_;
-	PublishingFlickrFlickrPublisher* _tmp45_;
-	PublishingFlickrFlickrPublisher* _tmp46_;
-	SpitPublishingPublisherMediaType _tmp47_;
-	gint _tmp48_;
-	PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp49_;
-	gint _tmp50_;
-	PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp51_;
+	GObject* _tmp4_;
+	GtkBox* _tmp5_;
+	GtkBuilder* _tmp6_;
+	GObject* _tmp7_;
+	GtkLabel* _tmp8_;
+	GtkBuilder* _tmp9_;
+	GObject* _tmp10_;
+	GtkLabel* _tmp11_;
+	GtkBuilder* _tmp12_;
+	GObject* _tmp13_;
+	GtkButton* _tmp14_;
+	GtkBuilder* _tmp15_;
+	GObject* _tmp16_;
+	GtkButton* _tmp17_;
+	GtkBuilder* _tmp18_;
+	GObject* _tmp19_;
+	GtkComboBoxText* _tmp20_;
+	GtkBuilder* _tmp21_;
+	GObject* _tmp22_;
+	GtkComboBoxText* _tmp23_;
+	GtkBuilder* _tmp24_;
+	GObject* _tmp25_;
+	GtkLabel* _tmp26_;
+	GtkBuilder* _tmp27_;
+	GObject* _tmp28_;
+	GtkCheckButton* _tmp29_;
+	SpitPublishingAuthenticator* _tmp30_;
+	SpitPublishingAuthenticator* _tmp31_;
+	gboolean _tmp32_;
+	PublishingFlickrPublishingParameters* _tmp37_;
+	PublishingFlickrFlickrPublisher* _tmp38_;
+	gint _tmp39_;
+	PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp40_;
+	gint _tmp41_;
+	PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp42_;
 	gchar* upload_label_text = NULL;
-	PublishingFlickrPublishingParameters* _tmp52_;
-	const gchar* _tmp53_;
-	gchar* _tmp54_;
-	PublishingFlickrPublishingParameters* _tmp55_;
-	PublishingFlickrUserKind _tmp56_;
-	GtkLabel* _tmp67_;
-	const gchar* _tmp68_;
+	const gchar* _tmp43_;
+	gchar* _tmp44_;
+	PublishingFlickrUserKind _tmp45_;
+	GtkLabel* _tmp55_;
+	const gchar* _tmp56_;
 	gchar* visibility_label_text = NULL;
-	gchar* _tmp69_;
-	SpitPublishingPublisherMediaType _tmp70_;
-	GtkLabel* _tmp74_;
-	const gchar* _tmp75_;
-	GtkComboBoxText* _tmp76_;
-	SpitPublishingPublisherMediaType _tmp77_;
-	GtkCheckButton* _tmp81_;
-	gboolean _tmp82_;
-	GtkButton* _tmp83_;
-	GtkButton* _tmp84_;
-#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	gchar* _tmp57_;
+	GtkLabel* _tmp60_;
+	const gchar* _tmp61_;
+	GtkComboBoxText* _tmp62_;
+	GtkCheckButton* _tmp66_;
+	GtkButton* _tmp67_;
+	GtkButton* _tmp68_;
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (publisher), NULL);
-#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_PARAMETERS (parameters), NULL);
-#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (GTK_IS_BUILDER (builder), NULL);
-#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrPublishingOptionsPane*) g_object_new (object_type, NULL);
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = builder;
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp0_ = _g_object_ref0 (builder);
+#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->builder = _tmp1_;
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = builder;
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_assert (_tmp2_ != NULL, "builder != null");
-#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = builder;
-#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = gtk_builder_get_objects (_tmp3_);
-#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = _tmp4_;
-#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6_ = g_slist_length (_tmp5_);
-#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_assert (_tmp6_ > ((guint) 0), "builder.get_objects().length() > 0");
-#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_slist_free0 (_tmp5_);
-#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp7_ = self->priv->builder;
-#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp8_ = gtk_builder_get_object (_tmp7_, "flickr_pane");
-#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 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->builder = _tmp0_;
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_assert (builder != NULL, "builder != null");
+#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp1_ = gtk_builder_get_objects (builder);
+#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp2_ = _tmp1_;
+#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_assert (g_slist_length (_tmp2_) > ((guint) 0), "builder.get_objects().length() > 0");
+#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_slist_free0 (_tmp2_);
+#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp3_ = self->priv->builder;
+#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp4_ = gtk_builder_get_object (_tmp3_, "flickr_pane");
+#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_box_get_type (), GtkBox));
+#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->pane_widget);
-#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->pane_widget = _tmp9_;
-#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp10_ = self->priv->builder;
-#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp11_ = gtk_builder_get_object (_tmp10_, "visibility_label");
-#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 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->pane_widget = _tmp5_;
+#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp6_ = self->priv->builder;
+#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp7_ = gtk_builder_get_object (_tmp6_, "visibility_label");
+#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_label_get_type (), GtkLabel));
+#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->visibility_label);
-#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->visibility_label = _tmp12_;
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp13_ = self->priv->builder;
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp14_ = gtk_builder_get_object (_tmp13_, "upload_info_label");
-#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 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->visibility_label = _tmp8_;
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp9_ = self->priv->builder;
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp10_ = gtk_builder_get_object (_tmp9_, "upload_info_label");
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_label_get_type (), GtkLabel));
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->upload_info_label);
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->upload_info_label = _tmp15_;
-#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp16_ = self->priv->builder;
-#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp17_ = gtk_builder_get_object (_tmp16_, "logout_button");
-#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 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->upload_info_label = _tmp11_;
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp12_ = self->priv->builder;
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp13_ = gtk_builder_get_object (_tmp12_, "logout_button");
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_button_get_type (), GtkButton));
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->logout_button);
-#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->logout_button = _tmp18_;
-#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp19_ = self->priv->builder;
-#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp20_ = gtk_builder_get_object (_tmp19_, "publish_button");
-#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 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->logout_button = _tmp14_;
+#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp15_ = self->priv->builder;
+#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp16_ = gtk_builder_get_object (_tmp15_, "publish_button");
+#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp17_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_button_get_type (), GtkButton));
+#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->publish_button);
-#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->publish_button = _tmp21_;
-#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp22_ = self->priv->builder;
-#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp23_ = gtk_builder_get_object (_tmp22_, "visibility_combo");
-#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 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->publish_button = _tmp17_;
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp18_ = self->priv->builder;
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp19_ = gtk_builder_get_object (_tmp18_, "visibility_combo");
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp20_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_combo_box_text_get_type (), GtkComboBoxText));
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->visibility_combo);
-#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->visibility_combo = _tmp24_;
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp25_ = self->priv->builder;
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp26_ = gtk_builder_get_object (_tmp25_, "size_combo");
-#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 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->visibility_combo = _tmp20_;
+#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp21_ = self->priv->builder;
+#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp22_ = gtk_builder_get_object (_tmp21_, "size_combo");
+#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp23_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_combo_box_text_get_type (), GtkComboBoxText));
+#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->size_combo);
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->size_combo = _tmp27_;
-#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp28_ = self->priv->builder;
-#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp29_ = gtk_builder_get_object (_tmp28_, "size_label");
-#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 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->size_combo = _tmp23_;
+#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp24_ = self->priv->builder;
+#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp25_ = gtk_builder_get_object (_tmp24_, "size_label");
+#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp26_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_label_get_type (), GtkLabel));
+#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->size_label);
-#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->size_label = _tmp30_;
-#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp31_ = self->priv->builder;
-#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp32_ = gtk_builder_get_object (_tmp31_, "strip_metadata_check");
-#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 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->size_label = _tmp26_;
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp27_ = self->priv->builder;
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp28_ = gtk_builder_get_object (_tmp27_, "strip_metadata_check");
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp29_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_check_button_get_type (), GtkCheckButton));
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->strip_metadata_check);
-#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->strip_metadata_check = _tmp33_;
-#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 5831 "FlickrPublishing.c"
-		GtkButton* _tmp39_;
-		GtkContainer* _tmp40_;
-		GtkContainer* _tmp41_;
-		GtkButton* _tmp42_;
-#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 5846 "FlickrPublishing.c"
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->strip_metadata_check = _tmp29_;
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp30_ = publishing_flickr_flickr_publisher_get_authenticator (publisher);
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp31_ = _tmp30_;
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp32_ = !spit_publishing_authenticator_can_logout (_tmp31_);
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_object_unref0 (_tmp31_);
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (_tmp32_) {
+#line 4348 "FlickrPublishing.c"
+		GtkButton* _tmp33_;
+		GtkContainer* _tmp34_;
+		GtkContainer* _tmp35_;
+		GtkButton* _tmp36_;
+#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp33_ = self->priv->logout_button;
+#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp34_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget));
+#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp35_ = _tmp34_;
+#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp36_ = self->priv->logout_button;
+#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		gtk_container_remove (_tmp35_, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_widget_get_type (), GtkWidget));
+#line 4363 "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"
+#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp37_ = _publishing_flickr_publishing_parameters_ref0 (parameters);
+#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
-#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"
+#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->parameters = _tmp37_;
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp38_ = _g_object_ref0 (publisher);
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->publisher);
-#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"
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->publisher = _tmp38_;
+#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->media_type = media_type;
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp40_ = publishing_flickr_publishing_options_pane_create_visibilities (self, &_tmp39_);
+#line 604 "/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 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"
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->visibilities = _tmp40_;
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->visibilities_length1 = _tmp39_;
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->_visibilities_size_ = self->priv->visibilities_length1;
-#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"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp42_ = publishing_flickr_publishing_options_pane_create_sizes (self, &_tmp41_);
+#line 605 "/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 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"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->sizes = _tmp42_;
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->sizes_length1 = _tmp41_;
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->_sizes_size_ = self->priv->sizes_length1;
-#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp52_ = parameters;
-#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp53_ = _tmp52_->username;
-#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp54_ = g_strdup_printf (_ ("You are logged into Flickr as %s.\n\n"), _tmp53_);
-#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	upload_label_text = _tmp54_;
-#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp55_ = parameters;
-#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp56_ = _tmp55_->user_kind;
-#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp56_ == PUBLISHING_FLICKR_USER_KIND_FREE) {
-#line 5902 "FlickrPublishing.c"
-		const gchar* _tmp57_;
-		PublishingFlickrPublishingParameters* _tmp58_;
-		gint64 _tmp59_;
-		gchar* _tmp60_;
-		gchar* _tmp61_;
-		gchar* _tmp62_;
-		gchar* _tmp63_;
-		gchar* _tmp64_;
-#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp57_ = upload_label_text;
-#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp58_ = parameters;
-#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp59_ = _tmp58_->quota_free_bytes;
-#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp60_ = g_format_size_full ((guint64) _tmp59_, G_FORMAT_SIZE_LONG_FORMAT | G_FORMAT_SIZE_IEC_UNITS);
-#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp61_ = _tmp60_;
-#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp62_ = g_strdup_printf (_ ("Your free Flickr account limits how much data you can upload per month" \
+#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp43_ = parameters->username;
+#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp44_ = g_strdup_printf (_ ("You are logged into Flickr as %s.\n\n"), _tmp43_);
+#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	upload_label_text = _tmp44_;
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp45_ = parameters->user_kind;
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (_tmp45_ == PUBLISHING_FLICKR_USER_KIND_FREE) {
+#line 4409 "FlickrPublishing.c"
+		const gchar* _tmp46_;
+		gint64 _tmp47_;
+		gchar* _tmp48_;
+		gchar* _tmp49_;
+		gchar* _tmp50_;
+		gchar* _tmp51_;
+		gchar* _tmp52_;
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp46_ = upload_label_text;
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp47_ = parameters->quota_free_bytes;
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp48_ = g_format_size_full ((guint64) _tmp47_, G_FORMAT_SIZE_LONG_FORMAT | G_FORMAT_SIZE_IEC_UNITS);
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp49_ = _tmp48_;
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp50_ = g_strdup_printf (_ ("Your free Flickr account limits how much data you can upload per month" \
 ".\n" \
-"This month you have %s remaining in your upload quota."), _tmp61_);
-#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_strconcat (_tmp57_, _tmp63_, NULL);
-#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+"This month you have %s remaining in your upload quota."), _tmp49_);
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp51_ = _tmp50_;
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp52_ = g_strconcat (_tmp46_, _tmp51_, NULL);
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (upload_label_text);
-#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		upload_label_text = _tmp64_;
-#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_free0 (_tmp63_);
-#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_free0 (_tmp61_);
-#line 5935 "FlickrPublishing.c"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		upload_label_text = _tmp52_;
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_g_free0 (_tmp51_);
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_g_free0 (_tmp49_);
+#line 4439 "FlickrPublishing.c"
 	} else {
-		const gchar* _tmp65_;
-		gchar* _tmp66_;
-#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp65_ = upload_label_text;
-#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp66_ = g_strconcat (_tmp65_, _ ("Your Flickr Pro account entitles you to unlimited uploads."), NULL);
-#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		const gchar* _tmp53_;
+		gchar* _tmp54_;
+#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp53_ = upload_label_text;
+#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp54_ = g_strconcat (_tmp53_, _ ("Your Flickr Pro account entitles you to unlimited uploads."), NULL);
+#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (upload_label_text);
-#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		upload_label_text = _tmp66_;
-#line 5947 "FlickrPublishing.c"
+#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		upload_label_text = _tmp54_;
+#line 4451 "FlickrPublishing.c"
 	}
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp67_ = self->priv->upload_info_label;
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp68_ = upload_label_text;
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	gtk_label_set_label (_tmp67_, _tmp68_);
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp69_ = g_strdup (_ ("Photos _visible to:"));
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	visibility_label_text = _tmp69_;
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp70_ = media_type;
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp70_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 5963 "FlickrPublishing.c"
-		gchar* _tmp71_;
-#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp71_ = g_strdup (_ ("Videos _visible to:"));
-#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp55_ = self->priv->upload_info_label;
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp56_ = upload_label_text;
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	gtk_label_set_label (_tmp55_, _tmp56_);
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp57_ = g_strdup (_ ("Photos _visible to:"));
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	visibility_label_text = _tmp57_;
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (media_type == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+#line 4465 "FlickrPublishing.c"
+		gchar* _tmp58_;
+#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp58_ = g_strdup (_ ("Videos _visible to:"));
+#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (visibility_label_text);
-#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		visibility_label_text = _tmp71_;
-#line 5971 "FlickrPublishing.c"
+#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		visibility_label_text = _tmp58_;
+#line 4473 "FlickrPublishing.c"
 	} else {
-		SpitPublishingPublisherMediaType _tmp72_;
-#line 812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp72_ = media_type;
-#line 812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		if (_tmp72_ == (SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO)) {
-#line 5978 "FlickrPublishing.c"
-			gchar* _tmp73_;
-#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_tmp73_ = g_strdup (_ ("Photos and videos _visible to:"));
-#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		if (media_type == (SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO)) {
+#line 4477 "FlickrPublishing.c"
+			gchar* _tmp59_;
+#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			_tmp59_ = g_strdup (_ ("Photos and videos _visible to:"));
+#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (visibility_label_text);
-#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			visibility_label_text = _tmp73_;
-#line 5986 "FlickrPublishing.c"
+#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			visibility_label_text = _tmp59_;
+#line 4485 "FlickrPublishing.c"
 		}
 	}
-#line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp74_ = self->priv->visibility_label;
-#line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp75_ = visibility_label_text;
-#line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	gtk_label_set_label (_tmp74_, _tmp75_);
-#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp60_ = self->priv->visibility_label;
+#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp61_ = visibility_label_text;
+#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	gtk_label_set_label (_tmp60_, _tmp61_);
+#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_populate_visibility_combo (self);
-#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp76_ = self->priv->visibility_combo;
-#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, 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"
-	_tmp77_ = media_type;
-#line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp77_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 6005 "FlickrPublishing.c"
-		GtkComboBoxText* _tmp78_;
-#line 823 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp62_ = self->priv->visibility_combo;
+#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_flickr_publishing_options_pane_on_visibility_changed_gtk_combo_box_changed, self, 0);
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (media_type != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+#line 4502 "FlickrPublishing.c"
+		GtkComboBoxText* _tmp63_;
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_populate_size_combo (self);
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp78_ = self->priv->size_combo;
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_flickr_publishing_options_pane_on_size_changed_gtk_combo_box_changed, self, 0);
-#line 6013 "FlickrPublishing.c"
+#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp63_ = self->priv->size_combo;
+#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_flickr_publishing_options_pane_on_size_changed_gtk_combo_box_changed, self, 0);
+#line 4510 "FlickrPublishing.c"
 	} else {
-		GtkComboBoxText* _tmp79_;
-		GtkLabel* _tmp80_;
-#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp79_ = self->priv->size_combo;
-#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp80_ = self->priv->size_label;
-#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 6025 "FlickrPublishing.c"
+		GtkComboBoxText* _tmp64_;
+		GtkLabel* _tmp65_;
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp64_ = self->priv->size_combo;
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp65_ = self->priv->size_label;
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 4522 "FlickrPublishing.c"
 	}
-#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp81_ = self->priv->strip_metadata_check;
-#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp82_ = strip_metadata;
-#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp82_);
-#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp83_ = self->priv->logout_button;
-#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_connect_object (_tmp83_, "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"
-	_tmp84_ = self->priv->publish_button;
-#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_connect_object (_tmp84_, "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"
+#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp66_ = self->priv->strip_metadata_check;
+#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_toggle_button_get_type (), GtkToggleButton), strip_metadata);
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp67_ = self->priv->logout_button;
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_signal_connect_object (_tmp67_, "clicked", (GCallback) _publishing_flickr_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
+#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp68_ = self->priv->publish_button;
+#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_signal_connect_object (_tmp68_, "clicked", (GCallback) _publishing_flickr_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (visibility_label_text);
-#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (upload_label_text);
-#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 6047 "FlickrPublishing.c"
+#line 4542 "FlickrPublishing.c"
 }
 
 
-PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane_new (PublishingFlickrFlickrPublisher* publisher, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublisherMediaType media_type, GtkBuilder* builder, gboolean strip_metadata) {
-#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+PublishingFlickrPublishingOptionsPane*
+publishing_flickr_publishing_options_pane_new (PublishingFlickrFlickrPublisher* publisher,
+                                               PublishingFlickrPublishingParameters* parameters,
+                                               SpitPublishingPublisherMediaType media_type,
+                                               GtkBuilder* builder,
+                                               gboolean strip_metadata)
+{
+#line 579 "/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 6054 "FlickrPublishing.c"
+#line 4555 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_publishing_options_pane_on_logout_clicked (PublishingFlickrPublishingOptionsPane* self) {
-#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+publishing_flickr_publishing_options_pane_on_logout_clicked (PublishingFlickrPublishingOptionsPane* self)
+{
+#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_emit (self, publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
-#line 6063 "FlickrPublishing.c"
+#line 4566 "FlickrPublishing.c"
 }
 
 
-static gpointer _publishing_flickr_visibility_specification_ref0 (gpointer self) {
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static gpointer
+_publishing_flickr_visibility_specification_ref0 (gpointer self)
+{
+#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? publishing_flickr_visibility_specification_ref (self) : NULL;
-#line 6070 "FlickrPublishing.c"
+#line 4575 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_publishing_options_pane_on_publish_clicked (PublishingFlickrPublishingOptionsPane* self) {
+static void
+publishing_flickr_publishing_options_pane_on_publish_clicked (PublishingFlickrPublishingOptionsPane* self)
+{
 	PublishingFlickrPublishingParameters* _tmp0_;
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp1_;
 	gint _tmp1__length1;
 	GtkComboBoxText* _tmp2_;
-	gint _tmp3_;
-	PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp4_;
+	PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp3_;
+	PublishingFlickrVisibilitySpecification* _tmp4_;
 	PublishingFlickrVisibilitySpecification* _tmp5_;
-	PublishingFlickrVisibilitySpecification* _tmp6_;
-	SpitPublishingPublisherMediaType _tmp7_;
-	GtkCheckButton* _tmp14_;
-	gboolean _tmp15_;
-#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	SpitPublishingPublisherMediaType _tmp6_;
+	GtkCheckButton* _tmp12_;
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->parameters;
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->visibilities;
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1__length1 = self->priv->visibilities_length1;
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = self->priv->visibility_combo;
-#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 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = _tmp1_[_tmp3_];
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = _tmp4_->specification;
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6_ = _publishing_flickr_visibility_specification_ref0 (_tmp5_);
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp3_ = _tmp1_[gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox))];
+#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp4_ = _tmp3_->specification;
+#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp5_ = _publishing_flickr_visibility_specification_ref0 (_tmp4_);
+#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (_tmp0_->visibility_specification);
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_->visibility_specification = _tmp6_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp7_ = self->priv->media_type;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if ((_tmp7_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) {
-#line 6112 "FlickrPublishing.c"
-		PublishingFlickrPublishingParameters* _tmp8_;
-		PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp9_;
-		gint _tmp9__length1;
-		GtkComboBoxText* _tmp10_;
+#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp0_->visibility_specification = _tmp5_;
+#line 652 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp6_ = self->priv->media_type;
+#line 652 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if ((_tmp6_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) {
+#line 4615 "FlickrPublishing.c"
+		PublishingFlickrPublishingParameters* _tmp7_;
+		PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp8_;
+		gint _tmp8__length1;
+		GtkComboBoxText* _tmp9_;
+		PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp10_;
 		gint _tmp11_;
-		PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp12_;
-		gint _tmp13_;
-#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp8_ = self->priv->parameters;
-#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp9_ = self->priv->sizes;
-#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp9__length1 = self->priv->sizes_length1;
-#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp10_ = self->priv->size_combo;
-#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 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp12_ = _tmp9_[_tmp11_];
-#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp13_ = _tmp12_->size;
-#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp8_->photo_major_axis_size = _tmp13_;
-#line 6136 "FlickrPublishing.c"
-	}
-#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp14_ = self->priv->strip_metadata_check;
-#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 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_emit (self, publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp15_);
-#line 6144 "FlickrPublishing.c"
-}
-
-
-static void _vala_array_add21 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp7_ = self->priv->parameters;
+#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp8_ = self->priv->sizes;
+#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp8__length1 = self->priv->sizes_length1;
+#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp9_ = self->priv->size_combo;
+#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp10_ = _tmp8_[gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_combo_box_get_type (), GtkComboBox))];
+#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp11_ = _tmp10_->size;
+#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp7_->photo_major_axis_size = _tmp11_;
+#line 4636 "FlickrPublishing.c"
+	}
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp12_ = self->priv->strip_metadata_check;
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_signal_emit (self, publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_toggle_button_get_type (), GtkToggleButton)));
+#line 4642 "FlickrPublishing.c"
+}
+
+
+static void
+_vala_array_add20 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array,
+                   int* length,
+                   int* size,
+                   PublishingFlickrPublishingOptionsPaneVisibilityEntry* value)
+{
+#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1);
-#line 6155 "FlickrPublishing.c"
+#line 4658 "FlickrPublishing.c"
 	}
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 6161 "FlickrPublishing.c"
+#line 4664 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add22 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+_vala_array_add21 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array,
+                   int* length,
+                   int* size,
+                   PublishingFlickrPublishingOptionsPaneVisibilityEntry* value)
+{
+#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1);
-#line 6172 "FlickrPublishing.c"
+#line 4680 "FlickrPublishing.c"
 	}
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 6178 "FlickrPublishing.c"
+#line 4686 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add23 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+_vala_array_add22 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array,
+                   int* length,
+                   int* size,
+                   PublishingFlickrPublishingOptionsPaneVisibilityEntry* value)
+{
+#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1);
-#line 6189 "FlickrPublishing.c"
+#line 4702 "FlickrPublishing.c"
 	}
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 6195 "FlickrPublishing.c"
+#line 4708 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add24 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
-#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+_vala_array_add23 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array,
+                   int* length,
+                   int* size,
+                   PublishingFlickrPublishingOptionsPaneVisibilityEntry* value)
+{
+#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1);
-#line 6206 "FlickrPublishing.c"
+#line 4724 "FlickrPublishing.c"
 	}
-#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 6212 "FlickrPublishing.c"
+#line 4730 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add25 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+_vala_array_add24 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array,
+                   int* length,
+                   int* size,
+                   PublishingFlickrPublishingOptionsPaneVisibilityEntry* value)
+{
+#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1);
-#line 6223 "FlickrPublishing.c"
+#line 4746 "FlickrPublishing.c"
 	}
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 6229 "FlickrPublishing.c"
+#line 4752 "FlickrPublishing.c"
 }
 
 
-static PublishingFlickrPublishingOptionsPaneVisibilityEntry** publishing_flickr_publishing_options_pane_create_visibilities (PublishingFlickrPublishingOptionsPane* self, int* result_length1) {
+static PublishingFlickrPublishingOptionsPaneVisibilityEntry**
+publishing_flickr_publishing_options_pane_create_visibilities (PublishingFlickrPublishingOptionsPane* self,
+                                                               int* result_length1)
+{
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry** result = NULL;
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry** _result_ = NULL;
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp0_;
@@ -6283,282 +4805,311 @@ static PublishingFlickrPublishingOptionsPaneVisibilityEntry** publishing_flickr_
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp20_;
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp21_;
 	gint _tmp21__length1;
-#line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
-#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = g_new0 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, 0 + 1);
-#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_result_ = _tmp0_;
-#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_result__length1 = 0;
-#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	__result__size_ = _result__length1;
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = _result_;
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1__length1 = _result__length1;
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = publishing_flickr_visibility_specification_new (1, 1, 1);
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = _tmp2_;
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_ ("Everyone"), _tmp3_);
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add21 (&_result_, &_result__length1, &__result__size_, _tmp4_);
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add20 (&_result_, &_result__length1, &__result__size_, _tmp4_);
+#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (_tmp3_);
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = _result_;
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5__length1 = _result__length1;
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = publishing_flickr_visibility_specification_new (1, 1, 0);
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = _tmp6_;
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_ ("Friends & family only"), _tmp7_);
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add22 (&_result_, &_result__length1, &__result__size_, _tmp8_);
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add21 (&_result_, &_result__length1, &__result__size_, _tmp8_);
+#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (_tmp7_);
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = _result_;
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9__length1 = _result__length1;
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = publishing_flickr_visibility_specification_new (0, 1, 0);
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp11_ = _tmp10_;
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp12_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_ ("Family only"), _tmp11_);
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add23 (&_result_, &_result__length1, &__result__size_, _tmp12_);
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add22 (&_result_, &_result__length1, &__result__size_, _tmp12_);
+#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (_tmp11_);
-#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp13_ = _result_;
-#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp13__length1 = _result__length1;
-#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14_ = publishing_flickr_visibility_specification_new (1, 0, 0);
-#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp15_ = _tmp14_;
-#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp16_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_ ("Friends only"), _tmp15_);
-#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add24 (&_result_, &_result__length1, &__result__size_, _tmp16_);
-#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add23 (&_result_, &_result__length1, &__result__size_, _tmp16_);
+#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (_tmp15_);
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp17_ = _result_;
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp17__length1 = _result__length1;
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp18_ = publishing_flickr_visibility_specification_new (0, 0, 0);
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp19_ = _tmp18_;
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp20_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_ ("Just me"), _tmp19_);
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add25 (&_result_, &_result__length1, &__result__size_, _tmp20_);
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add24 (&_result_, &_result__length1, &__result__size_, _tmp20_);
+#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (_tmp19_);
-#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp21_ = _result_;
-#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp21__length1 = _result__length1;
-#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (result_length1) {
-#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*result_length1 = _tmp21__length1;
-#line 6354 "FlickrPublishing.c"
+#line 4880 "FlickrPublishing.c"
 	}
-#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp21_;
-#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 6360 "FlickrPublishing.c"
+#line 4886 "FlickrPublishing.c"
 }
 
 
-static gpointer _publishing_flickr_publishing_options_pane_visibility_entry_ref0 (gpointer self) {
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static gpointer
+_publishing_flickr_publishing_options_pane_visibility_entry_ref0 (gpointer self)
+{
+#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? publishing_flickr_publishing_options_pane_visibility_entry_ref (self) : NULL;
-#line 6367 "FlickrPublishing.c"
+#line 4895 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_publishing_options_pane_populate_visibility_combo (PublishingFlickrPublishingOptionsPane* self) {
+static void
+publishing_flickr_publishing_options_pane_populate_visibility_combo (PublishingFlickrPublishingOptionsPane* self)
+{
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp0_;
 	gint _tmp0__length1;
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp3_;
 	gint _tmp3__length1;
 	GtkComboBoxText* _tmp8_;
 	PublishingFlickrFlickrPublisher* _tmp9_;
-	gint _tmp10_;
-#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->visibilities;
-#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0__length1 = self->priv->visibilities_length1;
-#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 6387 "FlickrPublishing.c"
+#line 4916 "FlickrPublishing.c"
 		gint _tmp1_;
 		PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp2_;
-#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp2_ = publishing_flickr_publishing_options_pane_create_visibilities (self, &_tmp1_);
-#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 672 "/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 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		self->priv->visibilities = _tmp2_;
-#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		self->priv->visibilities_length1 = _tmp1_;
-#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		self->priv->_visibilities_size_ = self->priv->visibilities_length1;
-#line 6400 "FlickrPublishing.c"
+#line 4929 "FlickrPublishing.c"
 	}
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = self->priv->visibilities;
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3__length1 = self->priv->visibilities_length1;
-#line 6406 "FlickrPublishing.c"
+#line 4935 "FlickrPublishing.c"
 	{
 		PublishingFlickrPublishingOptionsPaneVisibilityEntry** v_collection = NULL;
 		gint v_collection_length1 = 0;
 		gint _v_collection_size_ = 0;
 		gint v_it = 0;
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		v_collection = _tmp3_;
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		v_collection_length1 = _tmp3__length1;
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		for (v_it = 0; v_it < _tmp3__length1; v_it = v_it + 1) {
-#line 6418 "FlickrPublishing.c"
+#line 4947 "FlickrPublishing.c"
 			PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp4_;
 			PublishingFlickrPublishingOptionsPaneVisibilityEntry* v = NULL;
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp4_ = _publishing_flickr_publishing_options_pane_visibility_entry_ref0 (v_collection[v_it]);
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			v = _tmp4_;
-#line 6425 "FlickrPublishing.c"
+#line 4954 "FlickrPublishing.c"
 			{
 				GtkComboBoxText* _tmp5_;
 				PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp6_;
 				const gchar* _tmp7_;
-#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp5_ = self->priv->visibility_combo;
-#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp6_ = v;
-#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp7_ = _tmp6_->title;
-#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				gtk_combo_box_text_append_text (_tmp5_, _tmp7_);
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_publishing_flickr_publishing_options_pane_visibility_entry_unref0 (v);
-#line 6440 "FlickrPublishing.c"
+#line 4969 "FlickrPublishing.c"
 			}
 		}
 	}
-#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = self->priv->visibility_combo;
-#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = self->priv->publisher;
-#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp10_ = publishing_flickr_flickr_publisher_get_persistent_visibility (_tmp9_);
-#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 6452 "FlickrPublishing.c"
+#line 677 "/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), publishing_flickr_flickr_publisher_get_persistent_visibility (_tmp9_));
+#line 4979 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add26 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
-#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+_vala_array_add25 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array,
+                   int* length,
+                   int* size,
+                   PublishingFlickrPublishingOptionsPaneSizeEntry* value)
+{
+#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1);
-#line 6463 "FlickrPublishing.c"
+#line 4995 "FlickrPublishing.c"
 	}
-#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 6469 "FlickrPublishing.c"
+#line 5001 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add27 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
-#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+_vala_array_add26 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array,
+                   int* length,
+                   int* size,
+                   PublishingFlickrPublishingOptionsPaneSizeEntry* value)
+{
+#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1);
-#line 6480 "FlickrPublishing.c"
+#line 5017 "FlickrPublishing.c"
 	}
-#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 6486 "FlickrPublishing.c"
+#line 5023 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add28 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+_vala_array_add27 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array,
+                   int* length,
+                   int* size,
+                   PublishingFlickrPublishingOptionsPaneSizeEntry* value)
+{
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1);
-#line 6497 "FlickrPublishing.c"
+#line 5039 "FlickrPublishing.c"
 	}
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 6503 "FlickrPublishing.c"
+#line 5045 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add29 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
-#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+_vala_array_add28 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array,
+                   int* length,
+                   int* size,
+                   PublishingFlickrPublishingOptionsPaneSizeEntry* value)
+{
+#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1);
-#line 6514 "FlickrPublishing.c"
+#line 5061 "FlickrPublishing.c"
 	}
-#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 6520 "FlickrPublishing.c"
+#line 5067 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add30 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
-#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+_vala_array_add29 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array,
+                   int* length,
+                   int* size,
+                   PublishingFlickrPublishingOptionsPaneSizeEntry* value)
+{
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1);
-#line 6531 "FlickrPublishing.c"
+#line 5083 "FlickrPublishing.c"
 	}
-#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 6537 "FlickrPublishing.c"
+#line 5089 "FlickrPublishing.c"
 }
 
 
-static PublishingFlickrPublishingOptionsPaneSizeEntry** publishing_flickr_publishing_options_pane_create_sizes (PublishingFlickrPublishingOptionsPane* self, int* result_length1) {
+static PublishingFlickrPublishingOptionsPaneSizeEntry**
+publishing_flickr_publishing_options_pane_create_sizes (PublishingFlickrPublishingOptionsPane* self,
+                                                        int* result_length1)
+{
 	PublishingFlickrPublishingOptionsPaneSizeEntry** result = NULL;
 	PublishingFlickrPublishingOptionsPaneSizeEntry** _result_ = NULL;
 	PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp0_;
@@ -6581,545 +5132,602 @@ static PublishingFlickrPublishingOptionsPaneSizeEntry** publishing_flickr_publis
 	PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp10_;
 	PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp11_;
 	gint _tmp11__length1;
-#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
-#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = g_new0 (PublishingFlickrPublishingOptionsPaneSizeEntry*, 0 + 1);
-#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_result_ = _tmp0_;
-#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_result__length1 = 0;
-#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	__result__size_ = _result__length1;
-#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = _result_;
-#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1__length1 = _result__length1;
-#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = publishing_flickr_publishing_options_pane_size_entry_new (_ ("500 × 375 pixels"), 500);
-#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add26 (&_result_, &_result__length1, &__result__size_, _tmp2_);
-#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add25 (&_result_, &_result__length1, &__result__size_, _tmp2_);
+#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = _result_;
-#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3__length1 = _result__length1;
-#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = publishing_flickr_publishing_options_pane_size_entry_new (_ ("1024 × 768 pixels"), 1024);
-#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add27 (&_result_, &_result__length1, &__result__size_, _tmp4_);
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add26 (&_result_, &_result__length1, &__result__size_, _tmp4_);
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = _result_;
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5__length1 = _result__length1;
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = publishing_flickr_publishing_options_pane_size_entry_new (_ ("2048 × 1536 pixels"), 2048);
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add28 (&_result_, &_result__length1, &__result__size_, _tmp6_);
-#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add27 (&_result_, &_result__length1, &__result__size_, _tmp6_);
+#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = _result_;
-#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7__length1 = _result__length1;
-#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = publishing_flickr_publishing_options_pane_size_entry_new (_ ("4096 × 3072 pixels"), 4096);
-#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add29 (&_result_, &_result__length1, &__result__size_, _tmp8_);
-#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add28 (&_result_, &_result__length1, &__result__size_, _tmp8_);
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = _result_;
-#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9__length1 = _result__length1;
-#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = publishing_flickr_publishing_options_pane_size_entry_new (_ ("Original size"), PUBLISHING_FLICKR_ORIGINAL_SIZE);
-#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add30 (&_result_, &_result__length1, &__result__size_, _tmp10_);
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add29 (&_result_, &_result__length1, &__result__size_, _tmp10_);
+#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp11_ = _result_;
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp11__length1 = _result__length1;
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (result_length1) {
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*result_length1 = _tmp11__length1;
-#line 6622 "FlickrPublishing.c"
+#line 5177 "FlickrPublishing.c"
 	}
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp11_;
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 6628 "FlickrPublishing.c"
+#line 5183 "FlickrPublishing.c"
 }
 
 
-static gpointer _publishing_flickr_publishing_options_pane_size_entry_ref0 (gpointer self) {
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static gpointer
+_publishing_flickr_publishing_options_pane_size_entry_ref0 (gpointer self)
+{
+#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? publishing_flickr_publishing_options_pane_size_entry_ref (self) : NULL;
-#line 6635 "FlickrPublishing.c"
+#line 5192 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_publishing_options_pane_populate_size_combo (PublishingFlickrPublishingOptionsPane* self) {
+static void
+publishing_flickr_publishing_options_pane_populate_size_combo (PublishingFlickrPublishingOptionsPane* self)
+{
 	PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp0_;
 	gint _tmp0__length1;
 	PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp3_;
 	gint _tmp3__length1;
 	GtkComboBoxText* _tmp8_;
 	PublishingFlickrFlickrPublisher* _tmp9_;
-	gint _tmp10_;
-#line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->sizes;
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0__length1 = self->priv->sizes_length1;
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 6655 "FlickrPublishing.c"
+#line 5213 "FlickrPublishing.c"
 		gint _tmp1_;
 		PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp2_;
-#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp2_ = publishing_flickr_publishing_options_pane_create_sizes (self, &_tmp1_);
-#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 694 "/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 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		self->priv->sizes = _tmp2_;
-#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		self->priv->sizes_length1 = _tmp1_;
-#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		self->priv->_sizes_size_ = self->priv->sizes_length1;
-#line 6668 "FlickrPublishing.c"
+#line 5226 "FlickrPublishing.c"
 	}
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = self->priv->sizes;
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3__length1 = self->priv->sizes_length1;
-#line 6674 "FlickrPublishing.c"
+#line 5232 "FlickrPublishing.c"
 	{
 		PublishingFlickrPublishingOptionsPaneSizeEntry** e_collection = NULL;
 		gint e_collection_length1 = 0;
 		gint _e_collection_size_ = 0;
 		gint e_it = 0;
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		e_collection = _tmp3_;
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		e_collection_length1 = _tmp3__length1;
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		for (e_it = 0; e_it < _tmp3__length1; e_it = e_it + 1) {
-#line 6686 "FlickrPublishing.c"
+#line 5244 "FlickrPublishing.c"
 			PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp4_;
 			PublishingFlickrPublishingOptionsPaneSizeEntry* e = NULL;
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp4_ = _publishing_flickr_publishing_options_pane_size_entry_ref0 (e_collection[e_it]);
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			e = _tmp4_;
-#line 6693 "FlickrPublishing.c"
+#line 5251 "FlickrPublishing.c"
 			{
 				GtkComboBoxText* _tmp5_;
 				PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp6_;
 				const gchar* _tmp7_;
-#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp5_ = self->priv->size_combo;
-#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp6_ = e;
-#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp7_ = _tmp6_->title;
-#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				gtk_combo_box_text_append_text (_tmp5_, _tmp7_);
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_publishing_flickr_publishing_options_pane_size_entry_unref0 (e);
-#line 6708 "FlickrPublishing.c"
+#line 5266 "FlickrPublishing.c"
 			}
 		}
 	}
-#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = self->priv->size_combo;
-#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = self->priv->publisher;
-#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp10_ = publishing_flickr_flickr_publisher_get_persistent_default_size (_tmp9_);
-#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 6720 "FlickrPublishing.c"
+#line 699 "/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), publishing_flickr_flickr_publisher_get_persistent_default_size (_tmp9_));
+#line 5276 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_publishing_options_pane_on_size_changed (PublishingFlickrPublishingOptionsPane* self) {
+static void
+publishing_flickr_publishing_options_pane_on_size_changed (PublishingFlickrPublishingOptionsPane* self)
+{
 	PublishingFlickrFlickrPublisher* _tmp0_;
 	GtkComboBoxText* _tmp1_;
-	gint _tmp2_;
-#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->publisher;
-#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->size_combo;
-#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 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_set_persistent_default_size (_tmp0_, _tmp2_);
-#line 6738 "FlickrPublishing.c"
+#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	publishing_flickr_flickr_publisher_set_persistent_default_size (_tmp0_, gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)));
+#line 5293 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_publishing_options_pane_on_visibility_changed (PublishingFlickrPublishingOptionsPane* self) {
+static void
+publishing_flickr_publishing_options_pane_on_visibility_changed (PublishingFlickrPublishingOptionsPane* self)
+{
 	PublishingFlickrFlickrPublisher* _tmp0_;
 	GtkComboBoxText* _tmp1_;
-	gint _tmp2_;
-#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->publisher;
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->visibility_combo;
-#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 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_set_persistent_visibility (_tmp0_, _tmp2_);
-#line 6756 "FlickrPublishing.c"
+#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	publishing_flickr_flickr_publisher_set_persistent_visibility (_tmp0_, gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)));
+#line 5310 "FlickrPublishing.c"
 }
 
 
-void publishing_flickr_publishing_options_pane_notify_publish (PublishingFlickrPublishingOptionsPane* self) {
+void
+publishing_flickr_publishing_options_pane_notify_publish (PublishingFlickrPublishingOptionsPane* self)
+{
 	GtkCheckButton* _tmp0_;
-	gboolean _tmp1_;
-#line 903 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->strip_metadata_check;
-#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 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_emit (self, publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp1_);
-#line 6771 "FlickrPublishing.c"
+#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_signal_emit (self, publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton)));
+#line 5324 "FlickrPublishing.c"
 }
 
 
-void publishing_flickr_publishing_options_pane_notify_logout (PublishingFlickrPublishingOptionsPane* self) {
-#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+void
+publishing_flickr_publishing_options_pane_notify_logout (PublishingFlickrPublishingOptionsPane* self)
+{
+#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_emit (self, publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
-#line 6780 "FlickrPublishing.c"
+#line 5335 "FlickrPublishing.c"
 }
 
 
-static GtkWidget* publishing_flickr_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base) {
+static GtkWidget*
+publishing_flickr_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base)
+{
 	PublishingFlickrPublishingOptionsPane * self;
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_;
 	GtkWidget* _tmp1_;
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane);
-#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->pane_widget;
-#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 719 "/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 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp1_;
-#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 6799 "FlickrPublishing.c"
+#line 5356 "FlickrPublishing.c"
 }
 
 
-static SpitPublishingDialogPaneGeometryOptions publishing_flickr_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
+static SpitPublishingDialogPaneGeometryOptions
+publishing_flickr_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base)
+{
 	PublishingFlickrPublishingOptionsPane * self;
 	SpitPublishingDialogPaneGeometryOptions result = 0;
-#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane);
-#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 6812 "FlickrPublishing.c"
+#line 5371 "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 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+_publishing_flickr_publishing_options_pane_notify_publish_publishing_flickr_publishing_options_pane_publish (PublishingFlickrPublishingOptionsPane* _sender,
+                                                                                                             gboolean strip_metadata,
+                                                                                                             gpointer self)
+{
+#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_notify_publish ((PublishingFlickrPublishingOptionsPane*) self);
-#line 6819 "FlickrPublishing.c"
+#line 5382 "FlickrPublishing.c"
 }
 
 
-static void _publishing_flickr_publishing_options_pane_notify_logout_publishing_flickr_publishing_options_pane_logout (PublishingFlickrPublishingOptionsPane* _sender, gpointer self) {
-#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+_publishing_flickr_publishing_options_pane_notify_logout_publishing_flickr_publishing_options_pane_logout (PublishingFlickrPublishingOptionsPane* _sender,
+                                                                                                           gpointer self)
+{
+#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_notify_logout ((PublishingFlickrPublishingOptionsPane*) self);
-#line 6826 "FlickrPublishing.c"
+#line 5392 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
+static void
+publishing_flickr_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base)
+{
 	PublishingFlickrPublishingOptionsPane * self;
-#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane);
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 727 "/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 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 728 "/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 6838 "FlickrPublishing.c"
+#line 5406 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
+static void
+publishing_flickr_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base)
+{
 	PublishingFlickrPublishingOptionsPane * self;
 	guint _tmp0_;
 	guint _tmp1_;
-#line 924 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane);
-#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("publish", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp0_, NULL, FALSE);
-#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 732 "/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 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("logout", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE);
-#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/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 6856 "FlickrPublishing.c"
+#line 5426 "FlickrPublishing.c"
 }
 
 
-static PublishingFlickrPublishingOptionsPaneSizeEntry* publishing_flickr_publishing_options_pane_size_entry_construct (GType object_type, 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)
+{
 	PublishingFlickrPublishingOptionsPaneSizeEntry* self = NULL;
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-	gint _tmp2_;
-#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	gchar* _tmp0_;
+#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (creator_title != NULL, NULL);
-#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrPublishingOptionsPaneSizeEntry*) g_type_create_instance (object_type);
-#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = creator_title;
-#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp0_ = g_strdup (creator_title);
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->title);
-#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->title = _tmp1_;
-#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = creator_size;
-#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->size = _tmp2_;
-#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->title = _tmp0_;
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->size = creator_size;
+#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 6883 "FlickrPublishing.c"
+#line 5451 "FlickrPublishing.c"
 }
 
 
-static PublishingFlickrPublishingOptionsPaneSizeEntry* publishing_flickr_publishing_options_pane_size_entry_new (const gchar* creator_title, gint creator_size) {
-#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static PublishingFlickrPublishingOptionsPaneSizeEntry*
+publishing_flickr_publishing_options_pane_size_entry_new (const gchar* creator_title,
+                                                          gint creator_size)
+{
+#line 544 "/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 6890 "FlickrPublishing.c"
+#line 5461 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_publishing_options_pane_value_size_entry_init (GValue* value) {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+publishing_flickr_publishing_options_pane_value_size_entry_init (GValue* value)
+{
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 6897 "FlickrPublishing.c"
+#line 5470 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_publishing_options_pane_value_size_entry_free_value (GValue* value) {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+publishing_flickr_publishing_options_pane_value_size_entry_free_value (GValue* value)
+{
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_size_entry_unref (value->data[0].v_pointer);
-#line 6906 "FlickrPublishing.c"
+#line 5481 "FlickrPublishing.c"
 	}
 }
 
 
-static void publishing_flickr_publishing_options_pane_value_size_entry_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+publishing_flickr_publishing_options_pane_value_size_entry_copy_value (const GValue* src_value,
+                                                                       GValue* dest_value)
+{
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/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 6916 "FlickrPublishing.c"
+#line 5494 "FlickrPublishing.c"
 	} else {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 6920 "FlickrPublishing.c"
+#line 5498 "FlickrPublishing.c"
 	}
 }
 
 
-static gpointer publishing_flickr_publishing_options_pane_value_size_entry_peek_pointer (const GValue* value) {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static gpointer
+publishing_flickr_publishing_options_pane_value_size_entry_peek_pointer (const GValue* value)
+{
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 6928 "FlickrPublishing.c"
+#line 5508 "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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+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 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 6935 "FlickrPublishing.c"
+#line 5520 "FlickrPublishing.c"
 		PublishingFlickrPublishingOptionsPaneSizeEntry * object;
 		object = collect_values[0].v_pointer;
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/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 6942 "FlickrPublishing.c"
+#line 5527 "FlickrPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/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 6946 "FlickrPublishing.c"
+#line 5531 "FlickrPublishing.c"
 		}
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = publishing_flickr_publishing_options_pane_size_entry_ref (object);
-#line 6950 "FlickrPublishing.c"
+#line 5535 "FlickrPublishing.c"
 	} else {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 6954 "FlickrPublishing.c"
+#line 5539 "FlickrPublishing.c"
 	}
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 6958 "FlickrPublishing.c"
+#line 5543 "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) {
+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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!object_p) {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/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 6969 "FlickrPublishing.c"
+#line 5559 "FlickrPublishing.c"
 	}
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = NULL;
-#line 6975 "FlickrPublishing.c"
+#line 5565 "FlickrPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 6979 "FlickrPublishing.c"
+#line 5569 "FlickrPublishing.c"
 	} else {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/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 6983 "FlickrPublishing.c"
+#line 5573 "FlickrPublishing.c"
 	}
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 6987 "FlickrPublishing.c"
+#line 5577 "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) {
+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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 7001 "FlickrPublishing.c"
+#line 5597 "FlickrPublishing.c"
 }
 
 
-static gpointer publishing_flickr_publishing_options_pane_value_get_size_entry (const GValue* value) {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static gpointer
+publishing_flickr_publishing_options_pane_value_get_size_entry (const GValue* value)
+{
+#line 540 "/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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 7010 "FlickrPublishing.c"
+#line 5608 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_publishing_options_pane_value_set_size_entry (GValue* value, gpointer v_object) {
+static void
+publishing_flickr_publishing_options_pane_value_set_size_entry (GValue* value,
+                                                                gpointer v_object)
+{
 	PublishingFlickrPublishingOptionsPaneSizeEntry * old;
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (v_object) {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_size_entry_ref (value->data[0].v_pointer);
-#line 7030 "FlickrPublishing.c"
+#line 5631 "FlickrPublishing.c"
 	} else {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 7034 "FlickrPublishing.c"
+#line 5635 "FlickrPublishing.c"
 	}
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_size_entry_unref (old);
-#line 7040 "FlickrPublishing.c"
+#line 5641 "FlickrPublishing.c"
 	}
 }
 
 
-static void publishing_flickr_publishing_options_pane_value_take_size_entry (GValue* value, gpointer v_object) {
+static void
+publishing_flickr_publishing_options_pane_value_take_size_entry (GValue* value,
+                                                                 gpointer v_object)
+{
 	PublishingFlickrPublishingOptionsPaneSizeEntry * old;
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (v_object) {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 7059 "FlickrPublishing.c"
+#line 5663 "FlickrPublishing.c"
 	} else {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 7063 "FlickrPublishing.c"
+#line 5667 "FlickrPublishing.c"
 	}
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_size_entry_unref (old);
-#line 7069 "FlickrPublishing.c"
+#line 5673 "FlickrPublishing.c"
 	}
 }
 
 
-static void publishing_flickr_publishing_options_pane_size_entry_class_init (PublishingFlickrPublishingOptionsPaneSizeEntryClass * klass) {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+publishing_flickr_publishing_options_pane_size_entry_class_init (PublishingFlickrPublishingOptionsPaneSizeEntryClass * klass)
+{
+#line 540 "/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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingFlickrPublishingOptionsPaneSizeEntryClass *) klass)->finalize = publishing_flickr_publishing_options_pane_size_entry_finalize;
-#line 7079 "FlickrPublishing.c"
+#line 5685 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_publishing_options_pane_size_entry_instance_init (PublishingFlickrPublishingOptionsPaneSizeEntry * self) {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+publishing_flickr_publishing_options_pane_size_entry_instance_init (PublishingFlickrPublishingOptionsPaneSizeEntry * self)
+{
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->ref_count = 1;
-#line 7086 "FlickrPublishing.c"
+#line 5694 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_publishing_options_pane_size_entry_finalize (PublishingFlickrPublishingOptionsPaneSizeEntry * obj) {
+static void
+publishing_flickr_publishing_options_pane_size_entry_finalize (PublishingFlickrPublishingOptionsPaneSizeEntry * obj)
+{
 	PublishingFlickrPublishingOptionsPaneSizeEntry * self;
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->title);
-#line 7098 "FlickrPublishing.c"
+#line 5708 "FlickrPublishing.c"
 }
 
 
-static GType publishing_flickr_publishing_options_pane_size_entry_get_type (void) {
+static GType
+publishing_flickr_publishing_options_pane_size_entry_get_type (void)
+{
 	static volatile gsize publishing_flickr_publishing_options_pane_size_entry_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_flickr_publishing_options_pane_size_entry_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { publishing_flickr_publishing_options_pane_value_size_entry_init, publishing_flickr_publishing_options_pane_value_size_entry_free_value, publishing_flickr_publishing_options_pane_value_size_entry_copy_value, publishing_flickr_publishing_options_pane_value_size_entry_peek_pointer, "p", publishing_flickr_publishing_options_pane_value_size_entry_collect_value, "p", publishing_flickr_publishing_options_pane_value_size_entry_lcopy_value };
@@ -7133,283 +5741,329 @@ static GType publishing_flickr_publishing_options_pane_size_entry_get_type (void
 }
 
 
-static gpointer publishing_flickr_publishing_options_pane_size_entry_ref (gpointer instance) {
+static gpointer
+publishing_flickr_publishing_options_pane_size_entry_ref (gpointer instance)
+{
 	PublishingFlickrPublishingOptionsPaneSizeEntry * self;
 	self = instance;
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return instance;
-#line 7123 "FlickrPublishing.c"
+#line 5737 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_publishing_options_pane_size_entry_unref (gpointer instance) {
+static void
+publishing_flickr_publishing_options_pane_size_entry_unref (gpointer instance)
+{
 	PublishingFlickrPublishingOptionsPaneSizeEntry * self;
 	self = instance;
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_SIZE_ENTRY_GET_CLASS (self)->finalize (self);
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 7136 "FlickrPublishing.c"
+#line 5752 "FlickrPublishing.c"
 	}
 }
 
 
-static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_publishing_options_pane_visibility_entry_construct (GType object_type, 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)
+{
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry* self = NULL;
 	PublishingFlickrVisibilitySpecification* _tmp0_;
-	PublishingFlickrVisibilitySpecification* _tmp1_;
-	const gchar* _tmp2_;
-	gchar* _tmp3_;
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	gchar* _tmp1_;
+#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (creator_title != NULL, NULL);
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_VISIBILITY_SPECIFICATION (creator_specification), NULL);
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrPublishingOptionsPaneVisibilityEntry*) g_type_create_instance (object_type);
-#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = creator_specification;
-#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = _publishing_flickr_visibility_specification_ref0 (_tmp0_);
-#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp0_ = _publishing_flickr_visibility_specification_ref0 (creator_specification);
+#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (self->specification);
-#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->specification = _tmp1_;
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = creator_title;
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = g_strdup (_tmp2_);
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->specification = _tmp0_;
+#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp1_ = g_strdup (creator_title);
+#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->title);
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->title = _tmp3_;
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->title = _tmp1_;
+#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 7171 "FlickrPublishing.c"
+#line 5785 "FlickrPublishing.c"
 }
 
 
-static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_publishing_options_pane_visibility_entry_new (const gchar* creator_title, PublishingFlickrVisibilitySpecification* creator_specification) {
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static PublishingFlickrPublishingOptionsPaneVisibilityEntry*
+publishing_flickr_publishing_options_pane_visibility_entry_new (const gchar* creator_title,
+                                                                PublishingFlickrVisibilitySpecification* creator_specification)
+{
+#line 554 "/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 7178 "FlickrPublishing.c"
+#line 5795 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_publishing_options_pane_value_visibility_entry_init (GValue* value) {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+publishing_flickr_publishing_options_pane_value_visibility_entry_init (GValue* value)
+{
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 7185 "FlickrPublishing.c"
+#line 5804 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_publishing_options_pane_value_visibility_entry_free_value (GValue* value) {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+publishing_flickr_publishing_options_pane_value_visibility_entry_free_value (GValue* value)
+{
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_visibility_entry_unref (value->data[0].v_pointer);
-#line 7194 "FlickrPublishing.c"
+#line 5815 "FlickrPublishing.c"
 	}
 }
 
 
-static void publishing_flickr_publishing_options_pane_value_visibility_entry_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+publishing_flickr_publishing_options_pane_value_visibility_entry_copy_value (const GValue* src_value,
+                                                                             GValue* dest_value)
+{
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/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 7204 "FlickrPublishing.c"
+#line 5828 "FlickrPublishing.c"
 	} else {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 7208 "FlickrPublishing.c"
+#line 5832 "FlickrPublishing.c"
 	}
 }
 
 
-static gpointer publishing_flickr_publishing_options_pane_value_visibility_entry_peek_pointer (const GValue* value) {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static gpointer
+publishing_flickr_publishing_options_pane_value_visibility_entry_peek_pointer (const GValue* value)
+{
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 7216 "FlickrPublishing.c"
+#line 5842 "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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+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 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 7223 "FlickrPublishing.c"
+#line 5854 "FlickrPublishing.c"
 		PublishingFlickrPublishingOptionsPaneVisibilityEntry * object;
 		object = collect_values[0].v_pointer;
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/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 7230 "FlickrPublishing.c"
+#line 5861 "FlickrPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/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 7234 "FlickrPublishing.c"
+#line 5865 "FlickrPublishing.c"
 		}
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = publishing_flickr_publishing_options_pane_visibility_entry_ref (object);
-#line 7238 "FlickrPublishing.c"
+#line 5869 "FlickrPublishing.c"
 	} else {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 7242 "FlickrPublishing.c"
+#line 5873 "FlickrPublishing.c"
 	}
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 7246 "FlickrPublishing.c"
+#line 5877 "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) {
+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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!object_p) {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/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 7257 "FlickrPublishing.c"
+#line 5893 "FlickrPublishing.c"
 	}
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = NULL;
-#line 7263 "FlickrPublishing.c"
+#line 5899 "FlickrPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 7267 "FlickrPublishing.c"
+#line 5903 "FlickrPublishing.c"
 	} else {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/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 7271 "FlickrPublishing.c"
+#line 5907 "FlickrPublishing.c"
 	}
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 7275 "FlickrPublishing.c"
+#line 5911 "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) {
+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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 7289 "FlickrPublishing.c"
+#line 5931 "FlickrPublishing.c"
 }
 
 
-static gpointer publishing_flickr_publishing_options_pane_value_get_visibility_entry (const GValue* value) {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static gpointer
+publishing_flickr_publishing_options_pane_value_get_visibility_entry (const GValue* value)
+{
+#line 550 "/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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 7298 "FlickrPublishing.c"
+#line 5942 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_publishing_options_pane_value_set_visibility_entry (GValue* value, gpointer v_object) {
+static void
+publishing_flickr_publishing_options_pane_value_set_visibility_entry (GValue* value,
+                                                                      gpointer v_object)
+{
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry * old;
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (v_object) {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_visibility_entry_ref (value->data[0].v_pointer);
-#line 7318 "FlickrPublishing.c"
+#line 5965 "FlickrPublishing.c"
 	} else {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 7322 "FlickrPublishing.c"
+#line 5969 "FlickrPublishing.c"
 	}
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_visibility_entry_unref (old);
-#line 7328 "FlickrPublishing.c"
+#line 5975 "FlickrPublishing.c"
 	}
 }
 
 
-static void publishing_flickr_publishing_options_pane_value_take_visibility_entry (GValue* value, gpointer v_object) {
+static void
+publishing_flickr_publishing_options_pane_value_take_visibility_entry (GValue* value,
+                                                                       gpointer v_object)
+{
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry * old;
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (v_object) {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 7347 "FlickrPublishing.c"
+#line 5997 "FlickrPublishing.c"
 	} else {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 7351 "FlickrPublishing.c"
+#line 6001 "FlickrPublishing.c"
 	}
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_visibility_entry_unref (old);
-#line 7357 "FlickrPublishing.c"
+#line 6007 "FlickrPublishing.c"
 	}
 }
 
 
-static void publishing_flickr_publishing_options_pane_visibility_entry_class_init (PublishingFlickrPublishingOptionsPaneVisibilityEntryClass * klass) {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+publishing_flickr_publishing_options_pane_visibility_entry_class_init (PublishingFlickrPublishingOptionsPaneVisibilityEntryClass * klass)
+{
+#line 550 "/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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingFlickrPublishingOptionsPaneVisibilityEntryClass *) klass)->finalize = publishing_flickr_publishing_options_pane_visibility_entry_finalize;
-#line 7367 "FlickrPublishing.c"
+#line 6019 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_publishing_options_pane_visibility_entry_instance_init (PublishingFlickrPublishingOptionsPaneVisibilityEntry * self) {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+publishing_flickr_publishing_options_pane_visibility_entry_instance_init (PublishingFlickrPublishingOptionsPaneVisibilityEntry * self)
+{
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->ref_count = 1;
-#line 7374 "FlickrPublishing.c"
+#line 6028 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_publishing_options_pane_visibility_entry_finalize (PublishingFlickrPublishingOptionsPaneVisibilityEntry * obj) {
+static void
+publishing_flickr_publishing_options_pane_visibility_entry_finalize (PublishingFlickrPublishingOptionsPaneVisibilityEntry * obj)
+{
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry * self;
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (self->specification);
-#line 745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->title);
-#line 7388 "FlickrPublishing.c"
+#line 6044 "FlickrPublishing.c"
 }
 
 
-static GType publishing_flickr_publishing_options_pane_visibility_entry_get_type (void) {
+static GType
+publishing_flickr_publishing_options_pane_visibility_entry_get_type (void)
+{
 	static volatile gsize publishing_flickr_publishing_options_pane_visibility_entry_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_flickr_publishing_options_pane_visibility_entry_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { publishing_flickr_publishing_options_pane_value_visibility_entry_init, publishing_flickr_publishing_options_pane_value_visibility_entry_free_value, publishing_flickr_publishing_options_pane_value_visibility_entry_copy_value, publishing_flickr_publishing_options_pane_value_visibility_entry_peek_pointer, "p", publishing_flickr_publishing_options_pane_value_visibility_entry_collect_value, "p", publishing_flickr_publishing_options_pane_value_visibility_entry_lcopy_value };
@@ -7423,141 +6077,155 @@ static GType publishing_flickr_publishing_options_pane_visibility_entry_get_type
 }
 
 
-static gpointer publishing_flickr_publishing_options_pane_visibility_entry_ref (gpointer instance) {
+static gpointer
+publishing_flickr_publishing_options_pane_visibility_entry_ref (gpointer instance)
+{
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry * self;
 	self = instance;
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return instance;
-#line 7413 "FlickrPublishing.c"
+#line 6073 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_publishing_options_pane_visibility_entry_unref (gpointer instance) {
+static void
+publishing_flickr_publishing_options_pane_visibility_entry_unref (gpointer instance)
+{
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry * self;
 	self = instance;
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_VISIBILITY_ENTRY_GET_CLASS (self)->finalize (self);
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 7426 "FlickrPublishing.c"
+#line 6088 "FlickrPublishing.c"
 	}
 }
 
 
-static void publishing_flickr_publishing_options_pane_class_init (PublishingFlickrPublishingOptionsPaneClass * klass) {
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+publishing_flickr_publishing_options_pane_class_init (PublishingFlickrPublishingOptionsPaneClass * klass)
+{
+#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_parent_class = g_type_class_peek_parent (klass);
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFlickrPublishingOptionsPanePrivate));
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_flickr_publishing_options_pane_finalize;
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL] = 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 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL] = 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 7442 "FlickrPublishing.c"
+#line 6106 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+publishing_flickr_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface)
+{
+#line 539 "/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 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_flickr_publishing_options_pane_real_get_widget;
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 539 "/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 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 539 "/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 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 539 "/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 7457 "FlickrPublishing.c"
+#line 6123 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_publishing_options_pane_instance_init (PublishingFlickrPublishingOptionsPane * self) {
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+publishing_flickr_publishing_options_pane_instance_init (PublishingFlickrPublishingOptionsPane * self)
+{
+#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv = PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
-#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->pane_widget = NULL;
-#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->visibility_label = NULL;
-#line 756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->upload_info_label = NULL;
-#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->size_label = NULL;
-#line 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->logout_button = NULL;
-#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->publish_button = NULL;
-#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 567 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->visibility_combo = NULL;
-#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->size_combo = NULL;
-#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->strip_metadata_check = NULL;
-#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->visibilities = NULL;
-#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->visibilities_length1 = 0;
-#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->_visibilities_size_ = self->priv->visibilities_length1;
-#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->sizes = NULL;
-#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->sizes_length1 = 0;
-#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->_sizes_size_ = self->priv->sizes_length1;
-#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->parameters = NULL;
-#line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->publisher = NULL;
-#line 7498 "FlickrPublishing.c"
+#line 6166 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_publishing_options_pane_finalize (GObject * obj) {
+static void
+publishing_flickr_publishing_options_pane_finalize (GObject * obj)
+{
 	PublishingFlickrPublishingOptionsPane * self;
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane);
-#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->pane_widget);
-#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->visibility_label);
-#line 756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->upload_info_label);
-#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->size_label);
-#line 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->logout_button);
-#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->publish_button);
-#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 567 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->visibility_combo);
-#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->size_combo);
-#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->strip_metadata_check);
-#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 570 "/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 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 571 "/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 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
-#line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->publisher);
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_OBJECT_CLASS (publishing_flickr_publishing_options_pane_parent_class)->finalize (obj);
-#line 7536 "FlickrPublishing.c"
+#line 6206 "FlickrPublishing.c"
 }
 
 
-GType publishing_flickr_publishing_options_pane_get_type (void) {
+GType
+publishing_flickr_publishing_options_pane_get_type (void)
+{
 	static volatile gsize publishing_flickr_publishing_options_pane_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_flickr_publishing_options_pane_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingFlickrPublishingOptionsPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_flickr_publishing_options_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFlickrPublishingOptionsPane), 0, (GInstanceInitFunc) publishing_flickr_publishing_options_pane_instance_init, NULL };
@@ -7571,129 +6239,122 @@ GType publishing_flickr_publishing_options_pane_get_type (void) {
 }
 
 
-PublishingFlickrUploader* publishing_flickr_uploader_construct (GType object_type, PublishingFlickrSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingFlickrPublishingParameters* parameters, gboolean strip_metadata) {
+PublishingFlickrUploader*
+publishing_flickr_uploader_construct (GType object_type,
+                                      PublishingRESTSupportOAuth1Session* session,
+                                      SpitPublishingPublishable** publishables,
+                                      int publishables_length1,
+                                      PublishingFlickrPublishingParameters* parameters,
+                                      gboolean strip_metadata)
+{
 	PublishingFlickrUploader* self = NULL;
-	PublishingFlickrSession* _tmp0_;
-	SpitPublishingPublishable** _tmp1_;
-	gint _tmp1__length1;
-	PublishingFlickrPublishingParameters* _tmp2_;
-	PublishingFlickrPublishingParameters* _tmp3_;
-	gboolean _tmp4_;
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL);
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	PublishingFlickrPublishingParameters* _tmp0_;
+#line 741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (session), NULL);
+#line 741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_PARAMETERS (parameters), NULL);
-#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = session;
-#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = publishables;
-#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1__length1 = publishables_length1;
-#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 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = parameters;
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = _publishing_flickr_publishing_parameters_ref0 (_tmp2_);
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self = (PublishingFlickrUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), publishables, publishables_length1);
+#line 745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp0_ = _publishing_flickr_publishing_parameters_ref0 (parameters);
+#line 745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->parameters = _tmp3_;
-#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = strip_metadata;
-#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->strip_metadata = _tmp4_;
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->parameters = _tmp0_;
+#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->strip_metadata = strip_metadata;
+#line 741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 7588 "FlickrPublishing.c"
+#line 6252 "FlickrPublishing.c"
 }
 
 
-PublishingFlickrUploader* publishing_flickr_uploader_new (PublishingFlickrSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingFlickrPublishingParameters* parameters, gboolean strip_metadata) {
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+PublishingFlickrUploader*
+publishing_flickr_uploader_new (PublishingRESTSupportOAuth1Session* session,
+                                SpitPublishingPublishable** publishables,
+                                int publishables_length1,
+                                PublishingFlickrPublishingParameters* parameters,
+                                gboolean strip_metadata)
+{
+#line 741 "/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 7595 "FlickrPublishing.c"
+#line 6265 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add31 (gchar** * array, int* length, int* size, gchar* value) {
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+_vala_array_add30 (gchar** * array,
+                   int* length,
+                   int* size,
+                   gchar* value)
+{
+#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 7606 "FlickrPublishing.c"
+#line 6281 "FlickrPublishing.c"
 	}
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 7612 "FlickrPublishing.c"
+#line 6287 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrUploader* self, SpitPublishingPublishable* publishable) {
-	SpitPublishingPublishable* _tmp0_;
-	SpitPublishingPublisherMediaType _tmp1_;
+static void
+publishing_flickr_uploader_preprocess_publishable (PublishingFlickrUploader* self,
+                                                   SpitPublishingPublishable* publishable)
+{
 	GExiv2Metadata* publishable_metadata = NULL;
-	GExiv2Metadata* _tmp2_;
-	GExiv2Metadata* _tmp14_;
-	gboolean _tmp15_;
-	GExiv2Metadata* _tmp16_;
-	gboolean _tmp17_;
-	GExiv2Metadata* _tmp24_;
-	gboolean _tmp25_;
-	GExiv2Metadata* _tmp32_;
-	gboolean _tmp33_;
+	GExiv2Metadata* _tmp0_;
+	GExiv2Metadata* _tmp10_;
+	GExiv2Metadata* _tmp11_;
+	GExiv2Metadata* _tmp18_;
+	GExiv2Metadata* _tmp25_;
 	GError * _inner_error_ = NULL;
-#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_UPLOADER (self));
-#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable));
-#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = publishable;
-#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = spit_publishing_publishable_get_media_type (_tmp0_);
-#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp1_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
-#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (spit_publishing_publishable_get_media_type (publishable) != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
+#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 7642 "FlickrPublishing.c"
+#line 6310 "FlickrPublishing.c"
 	}
-#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = gexiv2_metadata_new ();
-#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishable_metadata = _tmp2_;
-#line 7648 "FlickrPublishing.c"
+#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp0_ = gexiv2_metadata_new ();
+#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	publishable_metadata = _tmp0_;
+#line 6316 "FlickrPublishing.c"
 	{
-		GExiv2Metadata* _tmp3_;
-		SpitPublishingPublishable* _tmp4_;
-		GFile* _tmp5_;
-		GFile* _tmp6_;
-		gchar* _tmp7_;
-		gchar* _tmp8_;
-#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp3_ = publishable_metadata;
-#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp4_ = publishable;
-#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp5_ = spit_publishing_publishable_get_serialized_file (_tmp4_);
-#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp6_ = _tmp5_;
-#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp7_ = g_file_get_path (_tmp6_);
-#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp8_ = _tmp7_;
-#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		gexiv2_metadata_open_path (_tmp3_, _tmp8_, &_inner_error_);
-#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_free0 (_tmp8_);
-#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_object_unref0 (_tmp6_);
-#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		GExiv2Metadata* _tmp1_;
+		GFile* _tmp2_;
+		GFile* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp1_ = publishable_metadata;
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp2_ = spit_publishing_publishable_get_serialized_file (publishable);
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp3_ = _tmp2_;
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp4_ = g_file_get_path (_tmp3_);
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp5_ = _tmp4_;
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		gexiv2_metadata_open_path (_tmp1_, _tmp5_, &_inner_error_);
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_g_free0 (_tmp5_);
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_g_object_unref0 (_tmp3_);
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7676 "FlickrPublishing.c"
+#line 6341 "FlickrPublishing.c"
 			goto __catch18_g_error;
 		}
 	}
@@ -7701,374 +6362,360 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 	__catch18_g_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPublishable* _tmp9_;
-		GFile* _tmp10_;
-		GFile* _tmp11_;
-		gchar* _tmp12_;
-		gchar* _tmp13_;
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		GFile* _tmp6_;
+		GFile* _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
+#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		err = _inner_error_;
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_inner_error_ = NULL;
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp9_ = publishable;
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp10_ = spit_publishing_publishable_get_serialized_file (_tmp9_);
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp11_ = _tmp10_;
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp12_ = g_file_get_path (_tmp11_);
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp13_ = _tmp12_;
-#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 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_object_unref0 (_tmp11_);
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp6_ = spit_publishing_publishable_get_serialized_file (publishable);
+#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp7_ = _tmp6_;
+#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp8_ = g_file_get_path (_tmp7_);
+#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp9_ = _tmp8_;
+#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		g_warning ("FlickrPublishing.vala:757: couldn't read metadata from file '%s' for u" \
+"pload preprocessing.", _tmp9_);
+#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_g_free0 (_tmp9_);
+#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_g_object_unref0 (_tmp7_);
+#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (err);
-#line 7711 "FlickrPublishing.c"
+#line 6373 "FlickrPublishing.c"
 	}
 	__finally18:
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_object_unref0 (publishable_metadata);
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 754 "/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 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 7724 "FlickrPublishing.c"
+#line 6386 "FlickrPublishing.c"
 	}
-#line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp14_ = publishable_metadata;
-#line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp15_ = gexiv2_metadata_has_iptc (_tmp14_);
-#line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (!_tmp15_) {
-#line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp10_ = publishable_metadata;
+#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (!gexiv2_metadata_has_iptc (_tmp10_)) {
+#line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_object_unref0 (publishable_metadata);
-#line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 7736 "FlickrPublishing.c"
-	}
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp16_ = publishable_metadata;
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp17_ = gexiv2_metadata_has_tag (_tmp16_, "Iptc.Application2.Caption");
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp17_) {
-#line 7744 "FlickrPublishing.c"
-		GExiv2Metadata* _tmp18_;
+#line 6396 "FlickrPublishing.c"
+	}
+#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp11_ = publishable_metadata;
+#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (gexiv2_metadata_has_tag (_tmp11_, "Iptc.Application2.Caption")) {
+#line 6402 "FlickrPublishing.c"
+		GExiv2Metadata* _tmp12_;
+		GExiv2Metadata* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+		gchar* _tmp16_;
+		gchar* _tmp17_;
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp12_ = publishable_metadata;
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp13_ = publishable_metadata;
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp14_ = gexiv2_metadata_get_tag_string (_tmp13_, "Iptc.Application2.Caption");
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp15_ = _tmp14_;
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp16_ = publishing_rest_support_asciify_string (_tmp15_);
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp17_ = _tmp16_;
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		gexiv2_metadata_set_tag_string (_tmp12_, "Iptc.Application2.Caption", _tmp17_);
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_g_free0 (_tmp17_);
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_g_free0 (_tmp15_);
+#line 6427 "FlickrPublishing.c"
+	}
+#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp18_ = publishable_metadata;
+#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (gexiv2_metadata_has_tag (_tmp18_, "Iptc.Application2.Headline")) {
+#line 6433 "FlickrPublishing.c"
 		GExiv2Metadata* _tmp19_;
-		gchar* _tmp20_;
+		GExiv2Metadata* _tmp20_;
 		gchar* _tmp21_;
 		gchar* _tmp22_;
 		gchar* _tmp23_;
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp18_ = publishable_metadata;
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		gchar* _tmp24_;
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp19_ = publishable_metadata;
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp20_ = gexiv2_metadata_get_tag_string (_tmp19_, "Iptc.Application2.Caption");
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp21_ = _tmp20_;
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp22_ = publishing_rest_support_asciify_string (_tmp21_);
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp23_ = _tmp22_;
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		gexiv2_metadata_set_tag_string (_tmp18_, "Iptc.Application2.Caption", _tmp23_);
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_free0 (_tmp23_);
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_free0 (_tmp21_);
-#line 7769 "FlickrPublishing.c"
-	}
-#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp24_ = publishable_metadata;
-#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp25_ = gexiv2_metadata_has_tag (_tmp24_, "Iptc.Application2.Headline");
-#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp25_) {
-#line 7777 "FlickrPublishing.c"
-		GExiv2Metadata* _tmp26_;
-		GExiv2Metadata* _tmp27_;
-		gchar* _tmp28_;
-		gchar* _tmp29_;
-		gchar* _tmp30_;
-		gchar* _tmp31_;
-#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp26_ = publishable_metadata;
-#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp27_ = publishable_metadata;
-#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp28_ = gexiv2_metadata_get_tag_string (_tmp27_, "Iptc.Application2.Headline");
-#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp29_ = _tmp28_;
-#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp30_ = publishing_rest_support_asciify_string (_tmp29_);
-#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp31_ = _tmp30_;
-#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		gexiv2_metadata_set_tag_string (_tmp26_, "Iptc.Application2.Headline", _tmp31_);
-#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_free0 (_tmp31_);
-#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_free0 (_tmp29_);
-#line 7802 "FlickrPublishing.c"
-	}
-#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp32_ = publishable_metadata;
-#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp33_ = gexiv2_metadata_has_tag (_tmp32_, "Iptc.Application2.Keywords");
-#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp33_) {
-#line 7810 "FlickrPublishing.c"
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp20_ = publishable_metadata;
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp21_ = gexiv2_metadata_get_tag_string (_tmp20_, "Iptc.Application2.Headline");
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp22_ = _tmp21_;
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp23_ = publishing_rest_support_asciify_string (_tmp22_);
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp24_ = _tmp23_;
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		gexiv2_metadata_set_tag_string (_tmp19_, "Iptc.Application2.Headline", _tmp24_);
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_g_free0 (_tmp24_);
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_g_free0 (_tmp22_);
+#line 6458 "FlickrPublishing.c"
+	}
+#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp25_ = publishable_metadata;
+#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (gexiv2_metadata_has_tag (_tmp25_, "Iptc.Application2.Keywords")) {
+#line 6464 "FlickrPublishing.c"
 		GeeSet* keyword_set = NULL;
-		GeeHashSet* _tmp34_;
+		GeeHashSet* _tmp26_;
 		gchar** iptc_keywords = NULL;
-		GExiv2Metadata* _tmp35_;
-		gchar** _tmp36_;
-		gchar** _tmp37_;
+		GExiv2Metadata* _tmp27_;
+		gchar** _tmp28_;
+		gchar** _tmp29_;
 		gint iptc_keywords_length1;
 		gint _iptc_keywords_size_;
-		gchar** _tmp38_;
-		gint _tmp38__length1;
+		gchar** _tmp30_;
+		gint _tmp30__length1;
 		gchar** xmp_keywords = NULL;
-		GExiv2Metadata* _tmp43_;
-		gchar** _tmp44_;
-		gchar** _tmp45_;
+		GExiv2Metadata* _tmp35_;
+		gchar** _tmp36_;
+		gchar** _tmp37_;
 		gint xmp_keywords_length1;
 		gint _xmp_keywords_size_;
-		gchar** _tmp46_;
-		gint _tmp46__length1;
+		gchar** _tmp38_;
+		gint _tmp38__length1;
 		gchar** all_keywords = NULL;
-		GeeSet* _tmp51_;
-		gint _tmp52_;
-		gpointer* _tmp53_;
+		GeeSet* _tmp43_;
+		gint _tmp44_;
+		gpointer* _tmp45_;
 		gint all_keywords_length1;
 		gint _all_keywords_size_;
-		gchar** _tmp54_;
-		gint _tmp54__length1;
+		gchar** _tmp46_;
+		gint _tmp46__length1;
 		gchar** no_keywords = NULL;
-		gchar** _tmp55_;
+		gchar** _tmp47_;
 		gint no_keywords_length1;
 		gint _no_keywords_size_;
-		gchar** _tmp56_;
-		gint _tmp56__length1;
-		gchar* _tmp57_;
-		GExiv2Metadata* _tmp58_;
-		gchar** _tmp59_;
-		gint _tmp59__length1;
-		GExiv2Metadata* _tmp60_;
-		gchar** _tmp61_;
-		gint _tmp61__length1;
-#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp34_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		keyword_set = G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_SET, GeeSet);
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp35_ = publishable_metadata;
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp37_ = _tmp36_ = gexiv2_metadata_get_tag_multiple (_tmp35_, "Iptc.Application2.Keywords");
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		iptc_keywords = _tmp37_;
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		iptc_keywords_length1 = _vala_array_length (_tmp36_);
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		gchar** _tmp48_;
+		gint _tmp48__length1;
+		gchar* _tmp49_;
+		GExiv2Metadata* _tmp50_;
+		gchar** _tmp51_;
+		gint _tmp51__length1;
+		GExiv2Metadata* _tmp52_;
+		gchar** _tmp53_;
+		gint _tmp53__length1;
+#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp26_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
+#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		keyword_set = G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_SET, GeeSet);
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp27_ = publishable_metadata;
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp29_ = _tmp28_ = gexiv2_metadata_get_tag_multiple (_tmp27_, "Iptc.Application2.Keywords");
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		iptc_keywords = _tmp29_;
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		iptc_keywords_length1 = _vala_array_length (_tmp28_);
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_iptc_keywords_size_ = iptc_keywords_length1;
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp38_ = iptc_keywords;
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp38__length1 = iptc_keywords_length1;
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp30_ = iptc_keywords;
+#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp30__length1 = iptc_keywords_length1;
+#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		if (_tmp30_ != NULL) {
+#line 6524 "FlickrPublishing.c"
+			gchar** _tmp31_;
+			gint _tmp31__length1;
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			_tmp31_ = iptc_keywords;
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			_tmp31__length1 = iptc_keywords_length1;
+#line 6531 "FlickrPublishing.c"
+			{
+				gchar** keyword_collection = NULL;
+				gint keyword_collection_length1 = 0;
+				gint _keyword_collection_size_ = 0;
+				gint keyword_it = 0;
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+				keyword_collection = _tmp31_;
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+				keyword_collection_length1 = _tmp31__length1;
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+				for (keyword_it = 0; keyword_it < _tmp31__length1; keyword_it = keyword_it + 1) {
+#line 6543 "FlickrPublishing.c"
+					gchar* _tmp32_;
+					gchar* keyword = NULL;
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+					_tmp32_ = g_strdup (keyword_collection[keyword_it]);
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+					keyword = _tmp32_;
+#line 6550 "FlickrPublishing.c"
+					{
+						GeeSet* _tmp33_;
+						const gchar* _tmp34_;
+#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+						_tmp33_ = keyword_set;
+#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+						_tmp34_ = keyword;
+#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+						gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection), _tmp34_);
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+						_g_free0 (keyword);
+#line 6562 "FlickrPublishing.c"
+					}
+				}
+			}
+		}
+#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp35_ = publishable_metadata;
+#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp37_ = _tmp36_ = gexiv2_metadata_get_tag_multiple (_tmp35_, "Xmp.dc.subject");
+#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		xmp_keywords = _tmp37_;
+#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		xmp_keywords_length1 = _vala_array_length (_tmp36_);
+#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_xmp_keywords_size_ = xmp_keywords_length1;
+#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp38_ = xmp_keywords;
+#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp38__length1 = xmp_keywords_length1;
+#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (_tmp38_ != NULL) {
-#line 7870 "FlickrPublishing.c"
+#line 6583 "FlickrPublishing.c"
 			gchar** _tmp39_;
 			gint _tmp39__length1;
-#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_tmp39_ = iptc_keywords;
-#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_tmp39__length1 = iptc_keywords_length1;
-#line 7877 "FlickrPublishing.c"
+#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			_tmp39_ = xmp_keywords;
+#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			_tmp39__length1 = xmp_keywords_length1;
+#line 6590 "FlickrPublishing.c"
 			{
 				gchar** keyword_collection = NULL;
 				gint keyword_collection_length1 = 0;
 				gint _keyword_collection_size_ = 0;
 				gint keyword_it = 0;
-#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				keyword_collection = _tmp39_;
-#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				keyword_collection_length1 = _tmp39__length1;
-#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				for (keyword_it = 0; keyword_it < _tmp39__length1; keyword_it = keyword_it + 1) {
-#line 7889 "FlickrPublishing.c"
+#line 6602 "FlickrPublishing.c"
 					gchar* _tmp40_;
 					gchar* keyword = NULL;
-#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp40_ = g_strdup (keyword_collection[keyword_it]);
-#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					keyword = _tmp40_;
-#line 7896 "FlickrPublishing.c"
+#line 6609 "FlickrPublishing.c"
 					{
 						GeeSet* _tmp41_;
 						const gchar* _tmp42_;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 788 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 						_tmp41_ = keyword_set;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 788 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 						_tmp42_ = keyword;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 788 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 						gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_COLLECTION, GeeCollection), _tmp42_);
-#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-						_g_free0 (keyword);
-#line 7908 "FlickrPublishing.c"
-					}
-				}
-			}
-		}
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp43_ = publishable_metadata;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp45_ = _tmp44_ = gexiv2_metadata_get_tag_multiple (_tmp43_, "Xmp.dc.subject");
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		xmp_keywords = _tmp45_;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		xmp_keywords_length1 = _vala_array_length (_tmp44_);
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_xmp_keywords_size_ = xmp_keywords_length1;
-#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp46_ = xmp_keywords;
-#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp46__length1 = xmp_keywords_length1;
-#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		if (_tmp46_ != NULL) {
-#line 7929 "FlickrPublishing.c"
-			gchar** _tmp47_;
-			gint _tmp47__length1;
-#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_tmp47_ = xmp_keywords;
-#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_tmp47__length1 = xmp_keywords_length1;
-#line 7936 "FlickrPublishing.c"
-			{
-				gchar** keyword_collection = NULL;
-				gint keyword_collection_length1 = 0;
-				gint _keyword_collection_size_ = 0;
-				gint keyword_it = 0;
-#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				keyword_collection = _tmp47_;
-#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				keyword_collection_length1 = _tmp47__length1;
-#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 7948 "FlickrPublishing.c"
-					gchar* _tmp48_;
-					gchar* keyword = NULL;
-#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_tmp48_ = g_strdup (keyword_collection[keyword_it]);
-#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					keyword = _tmp48_;
-#line 7955 "FlickrPublishing.c"
-					{
-						GeeSet* _tmp49_;
-						const gchar* _tmp50_;
-#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-						_tmp49_ = keyword_set;
-#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-						_tmp50_ = keyword;
-#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 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 						_g_free0 (keyword);
-#line 7967 "FlickrPublishing.c"
+#line 6621 "FlickrPublishing.c"
 					}
 				}
 			}
 		}
-#line 983 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp51_ = keyword_set;
-#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 983 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		all_keywords = _tmp53_;
-#line 983 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		all_keywords_length1 = _tmp52_;
-#line 983 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp43_ = keyword_set;
+#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp45_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_COLLECTION, GeeCollection), &_tmp44_);
+#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		all_keywords = _tmp45_;
+#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		all_keywords_length1 = _tmp44_;
+#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_all_keywords_size_ = all_keywords_length1;
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp54_ = all_keywords;
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp54__length1 = all_keywords_length1;
-#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 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		no_keywords = _tmp55_;
-#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp46_ = all_keywords;
+#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp46__length1 = all_keywords_length1;
+#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_vala_array_add30 (&all_keywords, &all_keywords_length1, &_all_keywords_size_, NULL);
+#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp47_ = g_new0 (gchar*, 1 + 1);
+#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		no_keywords = _tmp47_;
+#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		no_keywords_length1 = 1;
-#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_no_keywords_size_ = no_keywords_length1;
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp56_ = no_keywords;
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp56__length1 = no_keywords_length1;
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_free0 (_tmp56_[0]);
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp56_[0] = NULL;
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp57_ = _tmp56_[0];
-#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp58_ = publishable_metadata;
-#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp59_ = all_keywords;
-#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp59__length1 = all_keywords_length1;
-#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		gexiv2_metadata_set_tag_multiple (_tmp58_, "Xmp.dc.subject", _tmp59_);
-#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp60_ = publishable_metadata;
-#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp61_ = no_keywords;
-#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp61__length1 = no_keywords_length1;
-#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		gexiv2_metadata_set_tag_multiple (_tmp60_, "Iptc.Application2.Keywords", _tmp61_);
-#line 8022 "FlickrPublishing.c"
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp48_ = no_keywords;
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp48__length1 = no_keywords_length1;
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_g_free0 (_tmp48_[0]);
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp48_[0] = NULL;
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp49_ = _tmp48_[0];
+#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp50_ = publishable_metadata;
+#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp51_ = all_keywords;
+#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp51__length1 = all_keywords_length1;
+#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		gexiv2_metadata_set_tag_multiple (_tmp50_, "Xmp.dc.subject", _tmp51_);
+#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp52_ = publishable_metadata;
+#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp53_ = no_keywords;
+#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp53__length1 = no_keywords_length1;
+#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		gexiv2_metadata_set_tag_multiple (_tmp52_, "Iptc.Application2.Keywords", _tmp53_);
+#line 6676 "FlickrPublishing.c"
 		{
-			GExiv2Metadata* _tmp62_;
-			SpitPublishingPublishable* _tmp63_;
-			GFile* _tmp64_;
-			GFile* _tmp65_;
-			gchar* _tmp66_;
-			gchar* _tmp67_;
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_tmp62_ = publishable_metadata;
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_tmp63_ = publishable;
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_tmp64_ = spit_publishing_publishable_get_serialized_file (_tmp63_);
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_tmp65_ = _tmp64_;
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_tmp66_ = g_file_get_path (_tmp65_);
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_tmp67_ = _tmp66_;
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			gexiv2_metadata_save_file (_tmp62_, _tmp67_, &_inner_error_);
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_g_free0 (_tmp67_);
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_g_object_unref0 (_tmp65_);
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			GExiv2Metadata* _tmp54_;
+			GFile* _tmp55_;
+			GFile* _tmp56_;
+			gchar* _tmp57_;
+			gchar* _tmp58_;
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			_tmp54_ = publishable_metadata;
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			_tmp55_ = spit_publishing_publishable_get_serialized_file (publishable);
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			_tmp56_ = _tmp55_;
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			_tmp57_ = g_file_get_path (_tmp56_);
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			_tmp58_ = _tmp57_;
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			gexiv2_metadata_save_file (_tmp54_, _tmp58_, &_inner_error_);
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			_g_free0 (_tmp58_);
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			_g_object_unref0 (_tmp56_);
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8050 "FlickrPublishing.c"
+#line 6701 "FlickrPublishing.c"
 				goto __catch19_g_error;
 			}
 		}
@@ -8076,160 +6723,168 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 		__catch19_g_error:
 		{
 			GError* err = NULL;
-			SpitPublishingPublishable* _tmp68_;
-			GFile* _tmp69_;
-			GFile* _tmp70_;
-			gchar* _tmp71_;
-			gchar* _tmp72_;
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			GFile* _tmp59_;
+			GFile* _tmp60_;
+			gchar* _tmp61_;
+			gchar* _tmp62_;
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			err = _inner_error_;
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_inner_error_ = NULL;
-#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_tmp68_ = publishable;
-#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_tmp69_ = spit_publishing_publishable_get_serialized_file (_tmp68_);
-#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_tmp70_ = _tmp69_;
-#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_tmp71_ = g_file_get_path (_tmp70_);
-#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_tmp72_ = _tmp71_;
-#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 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_g_free0 (_tmp72_);
-#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_g_object_unref0 (_tmp70_);
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			_tmp59_ = spit_publishing_publishable_get_serialized_file (publishable);
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			_tmp60_ = _tmp59_;
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			_tmp61_ = g_file_get_path (_tmp60_);
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			_tmp62_ = _tmp61_;
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			g_warning ("FlickrPublishing.vala:810: couldn't write metadata to file '%s' for up" \
+"load preprocessing.", _tmp62_);
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			_g_free0 (_tmp62_);
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			_g_object_unref0 (_tmp60_);
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_error_free0 (err);
-#line 8085 "FlickrPublishing.c"
+#line 6733 "FlickrPublishing.c"
 		}
 		__finally19:
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			no_keywords = (_vala_array_free (no_keywords, no_keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			all_keywords = (_vala_array_free (all_keywords, all_keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			xmp_keywords = (_vala_array_free (xmp_keywords, xmp_keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			iptc_keywords = (_vala_array_free (iptc_keywords, iptc_keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_object_unref0 (keyword_set);
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_object_unref0 (publishable_metadata);
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 807 "/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 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 8108 "FlickrPublishing.c"
+#line 6756 "FlickrPublishing.c"
 		}
-#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		no_keywords = (_vala_array_free (no_keywords, no_keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		all_keywords = (_vala_array_free (all_keywords, all_keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		xmp_keywords = (_vala_array_free (xmp_keywords, xmp_keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		iptc_keywords = (_vala_array_free (iptc_keywords, iptc_keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_object_unref0 (keyword_set);
-#line 8120 "FlickrPublishing.c"
+#line 6768 "FlickrPublishing.c"
 	}
-#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (publishable_metadata);
-#line 8124 "FlickrPublishing.c"
+#line 6772 "FlickrPublishing.c"
 }
 
 
-static PublishingRESTSupportTransaction* publishing_flickr_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable) {
+static PublishingRESTSupportTransaction*
+publishing_flickr_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base,
+                                                    SpitPublishingPublishable* publishable)
+{
 	PublishingFlickrUploader * self;
 	PublishingRESTSupportTransaction* result = NULL;
 	SpitPublishingPublishable* _tmp0_;
 	SpitPublishingPublishable* _tmp1_;
 	PublishingRESTSupportSession* _tmp2_;
-	PublishingFlickrSession* _tmp3_;
+	PublishingRESTSupportOAuth1Session* _tmp3_;
 	PublishingFlickrPublishingParameters* _tmp4_;
 	SpitPublishingPublishable* _tmp5_;
 	SpitPublishingPublishable* _tmp6_;
 	PublishingFlickrUploadTransaction* _tmp7_;
 	PublishingRESTSupportTransaction* _tmp8_;
-#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_UPLOADER, PublishingFlickrUploader);
-#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 818 "/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 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 818 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = _tmp0_;
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 818 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_uploader_preprocess_publishable (self, _tmp1_);
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 818 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 819 "/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 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSession);
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_SESSION, PublishingRESTSupportOAuth1Session);
+#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = self->priv->parameters;
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 819 "/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 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = _tmp5_;
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = publishing_flickr_upload_transaction_new (_tmp3_, _tmp4_, _tmp6_);
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (_tmp6_);
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_rest_support_session_unref0 (_tmp3_);
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp8_;
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 8174 "FlickrPublishing.c"
+#line 6825 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_uploader_class_init (PublishingFlickrUploaderClass * klass) {
-#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+publishing_flickr_uploader_class_init (PublishingFlickrUploaderClass * klass)
+{
+#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_uploader_parent_class = g_type_class_peek_parent (klass);
-#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->finalize = publishing_flickr_uploader_finalize;
-#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFlickrUploaderPrivate));
-#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_flickr_uploader_real_create_transaction;
-#line 8187 "FlickrPublishing.c"
+#line 6840 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_uploader_instance_init (PublishingFlickrUploader * self) {
-#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void
+publishing_flickr_uploader_instance_init (PublishingFlickrUploader * self)
+{
+#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv = PUBLISHING_FLICKR_UPLOADER_GET_PRIVATE (self);
-#line 8194 "FlickrPublishing.c"
+#line 6849 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_uploader_finalize (PublishingRESTSupportBatchUploader * obj) {
+static void
+publishing_flickr_uploader_finalize (PublishingRESTSupportBatchUploader * obj)
+{
 	PublishingFlickrUploader * self;
-#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_UPLOADER, PublishingFlickrUploader);
-#line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
-#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_flickr_uploader_parent_class)->finalize (obj);
-#line 8206 "FlickrPublishing.c"
+#line 6863 "FlickrPublishing.c"
 }
 
 
-GType publishing_flickr_uploader_get_type (void) {
+GType
+publishing_flickr_uploader_get_type (void)
+{
 	static volatile gsize publishing_flickr_uploader_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_flickr_uploader_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingFlickrUploaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_flickr_uploader_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFlickrUploader), 0, (GInstanceInitFunc) publishing_flickr_uploader_instance_init, NULL };
@@ -8241,7 +6896,11 @@ GType publishing_flickr_uploader_get_type (void) {
 }
 
 
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_destroy (gpointer array,
+                     gint array_length,
+                     GDestroyNotify destroy_func)
+{
 	if ((array != NULL) && (destroy_func != NULL)) {
 		int i;
 		for (i = 0; i < array_length; i = i + 1) {
@@ -8253,13 +6912,19 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti
 }
 
 
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_free (gpointer array,
+                  gint array_length,
+                  GDestroyNotify destroy_func)
+{
 	_vala_array_destroy (array, array_length, destroy_func);
 	g_free (array);
 }
 
 
-static gint _vala_array_length (gpointer array) {
+static gint
+_vala_array_length (gpointer array)
+{
 	int length;
 	length = 0;
 	if (array) {
diff --git a/plugins/shotwell-publishing/FlickrPublishing.vala b/plugins/shotwell-publishing/FlickrPublishing.vala
index 24b2b61..5a80284 100644
--- a/plugins/shotwell-publishing/FlickrPublishing.vala
+++ b/plugins/shotwell-publishing/FlickrPublishing.vala
@@ -59,7 +59,6 @@ internal const string SERVICE_NAME = "Flickr";
 internal const string ENDPOINT_URL = "https://api.flickr.com/services/rest";
 internal const int ORIGINAL_SIZE = -1;
 internal const string EXPIRED_SESSION_ERROR_CODE = "98";
-internal const string ENCODE_RFC_3986_EXTRA = "!*'();:@&=+$,/?%#[] \\";
 
 internal enum UserKind {
     PRO,
@@ -96,7 +95,7 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object {
     private Spit.Publishing.ProgressCallback progress_reporter = null;
     private bool running = false;
     private bool was_started = false;
-    private Session session = null;
+    private Publishing.RESTSupport.OAuth1.Session session = null;
     private PublishingOptionsPane publishing_options_pane = null;
     private Spit.Publishing.Authenticator authenticator = null;
    
@@ -107,7 +106,7 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object {
         debug("FlickrPublisher instantiated.");
         this.service = service;
         this.host = host;
-        this.session = new Session();
+        this.session = new Publishing.RESTSupport.OAuth1.Session(ENDPOINT_URL);
         this.parameters = new PublishingParameters();
         this.authenticator = Publishing.Authenticator.Factory.get_instance().create("flickr", host);
 
@@ -445,37 +444,7 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object {
     }
 }
 
-internal class Transaction : Publishing.RESTSupport.Transaction {
-    public Transaction(Session session, Publishing.RESTSupport.HttpMethod method =
-        Publishing.RESTSupport.HttpMethod.POST) {
-        base(session, method);
-        
-        add_argument("oauth_nonce", session.get_oauth_nonce());
-        add_argument("oauth_signature_method", "HMAC-SHA1");
-        add_argument("oauth_version", "1.0");
-        add_argument("oauth_callback", "oob");
-        add_argument("oauth_timestamp", session.get_oauth_timestamp());
-        add_argument("oauth_consumer_key", session.get_consumer_key());
-    }
-    
-    public Transaction.with_uri(Session session, string uri,
-        Publishing.RESTSupport.HttpMethod method = Publishing.RESTSupport.HttpMethod.POST) {
-        base.with_endpoint_url(session, uri, method);
-
-        add_argument("oauth_nonce", session.get_oauth_nonce());
-        add_argument("oauth_signature_method", "HMAC-SHA1");
-        add_argument("oauth_version", "1.0");
-        add_argument("oauth_callback", "oob");
-        add_argument("oauth_timestamp", session.get_oauth_timestamp());
-        add_argument("oauth_consumer_key", session.get_consumer_key());
-    }
-
-    public override void execute() throws Spit.Publishing.PublishingError {
-        ((Session) get_parent_session()).sign_transaction(this);
-        
-        base.execute();
-    }
-
+namespace Transaction {
     public static string? validate_xml(Publishing.RESTSupport.XmlDocument doc) {
         Xml.Node* root = doc.get_root_node();
         string? status = root->get_prop("stat");
@@ -525,35 +494,22 @@ internal class Transaction : Publishing.RESTSupport.Transaction {
     }
 }
 
-internal class AccountInfoFetchTransaction : Transaction {
-    public AccountInfoFetchTransaction(Session session) {
+internal class AccountInfoFetchTransaction : Publishing.RESTSupport.OAuth1.Transaction {
+    public AccountInfoFetchTransaction(Publishing.RESTSupport.OAuth1.Session session) {
         base(session, Publishing.RESTSupport.HttpMethod.GET);
         add_argument("method", "flickr.people.getUploadStatus");
-        add_argument("oauth_token", session.get_access_phase_token());
     }
 }
 
-private class UploadTransaction : Publishing.RESTSupport.UploadTransaction {
+private class UploadTransaction : Publishing.RESTSupport.OAuth1.UploadTransaction {
     private PublishingParameters parameters;
-    private Session session;
-    private Publishing.RESTSupport.Argument[] auth_header_fields;
 
-    public UploadTransaction(Session session, PublishingParameters parameters,
+    public UploadTransaction(Publishing.RESTSupport.OAuth1.Session session, PublishingParameters parameters,
         Spit.Publishing.Publishable publishable) {
-        base.with_endpoint_url(session, publishable, "https://api.flickr.com/services/upload");
+        base(session, publishable, "https://api.flickr.com/services/upload");
 
         this.parameters = parameters;
-        this.session = session;
-        this.auth_header_fields = new Publishing.RESTSupport.Argument[0];
-
-        add_authorization_header_field("oauth_nonce", session.get_oauth_nonce());
-        add_authorization_header_field("oauth_signature_method", "HMAC-SHA1");
-        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", 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)));
         add_argument("is_friend", ("%d".printf(parameters.visibility_specification.friends_level)));
         add_argument("is_family", ("%d".printf(parameters.visibility_specification.family_level)));
@@ -573,162 +529,13 @@ private class UploadTransaction : Publishing.RESTSupport.UploadTransaction {
 
         set_binary_disposition_table(disposition_table);
     }
-    
-    public void add_authorization_header_field(string key, string value) {
-        auth_header_fields += new Publishing.RESTSupport.Argument(key, value);
-    }
-    
-    public Publishing.RESTSupport.Argument[] get_authorization_header_fields() {
-        return auth_header_fields;
-    }
-    
-    public string get_authorization_header_string() {
-        string result = "OAuth ";
-        
-        for (int i = 0; i < auth_header_fields.length; i++) {
-            result += auth_header_fields[i].key;
-            result += "=";
-            result += ("\"" + auth_header_fields[i].value + "\"");
-            
-            if (i < auth_header_fields.length - 1)
-                result += ", ";
-        }
-        
-        return result;
-    }
-    
+
     public override void execute() throws Spit.Publishing.PublishingError {
-        session.sign_transaction(this);
-        
-        string authorization_header = get_authorization_header_string();
-        
-        debug("executing upload transaction: authorization header string = '%s'",
-            authorization_header);
-        add_header("Authorization", authorization_header);
-        
+        this.authorize();
         base.execute();
     }
 }
 
-internal class Session : Publishing.RESTSupport.Session {
-    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);
-    }
-
-    public override bool is_authenticated() {
-        return (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) {
-        string http_method = txn.get_method().to_string();
-        
-        debug("signing transaction with parameters:");
-        debug("HTTP method = " + http_method);
-
-        Publishing.RESTSupport.Argument[] base_string_arguments = txn.get_arguments();
-
-        UploadTransaction? upload_txn = txn as UploadTransaction;
-        if (upload_txn != null) {
-            debug("this transaction is an UploadTransaction; including Authorization header " +
-                "fields in signature base string");
-            
-            Publishing.RESTSupport.Argument[] auth_header_args =
-                upload_txn.get_authorization_header_fields();
-
-            foreach (Publishing.RESTSupport.Argument arg in auth_header_args)
-                base_string_arguments += arg;
-        }
-        
-        Publishing.RESTSupport.Argument[] sorted_args =
-            Publishing.RESTSupport.Argument.sort(base_string_arguments);
-        
-        string arguments_string = "";
-        for (int i = 0; i < sorted_args.length; i++) {
-            arguments_string += (sorted_args[i].key + "=" + sorted_args[i].value);
-            if (i < sorted_args.length - 1)
-                arguments_string += "&";
-        }
-
-        string? signing_key = null;
-        if (access_phase_token_secret != null) {
-            debug("access phase token secret available; using it as signing key");
-
-            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 = consumer_secret + "&";
-        }
-        
-        string signature_base_string = http_method + "&" + Soup.URI.encode(
-            txn.get_endpoint_url(), ENCODE_RFC_3986_EXTRA) + "&" +
-            Soup.URI.encode(arguments_string, ENCODE_RFC_3986_EXTRA);
-
-        debug("signature base string = '%s'", signature_base_string);
-        
-        debug("signing key = '%s'", signing_key);
-
-        // compute the signature
-        string signature = RESTSupport.hmac_sha1(signing_key, signature_base_string);
-        signature = Soup.URI.encode(signature, ENCODE_RFC_3986_EXTRA);
-
-        debug("signature = '%s'", signature);
-
-        if (upload_txn != null)
-            upload_txn.add_authorization_header_field("oauth_signature", signature);
-        else
-            txn.add_argument("oauth_signature", signature);
-    }
-    
-    public void set_access_phase_credentials(string token, string secret, string username) {
-        this.access_phase_token = token;
-        this.access_phase_token_secret = secret;
-        this.username = username;
-        
-        authenticated();
-    }
-
-    public string get_oauth_nonce() {
-        TimeVal currtime = TimeVal();
-        currtime.get_current_time();
-        
-        return Checksum.compute_for_string(ChecksumType.MD5, currtime.tv_sec.to_string() +
-            currtime.tv_usec.to_string());
-    }
-    
-    public string get_oauth_timestamp() {
-        return GLib.get_real_time().to_string().substring(0, 10);
-    }
-
-    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_username() {
-        assert(is_authenticated());
-        return username;
-    }
-}
-
 internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
     private class SizeEntry {
         public string title;
@@ -931,7 +738,7 @@ internal class Uploader : Publishing.RESTSupport.BatchUploader {
     private PublishingParameters parameters;
     private bool strip_metadata;
 
-    public Uploader(Session session, Spit.Publishing.Publishable[] publishables,
+    public Uploader(Publishing.RESTSupport.OAuth1.Session session, Spit.Publishing.Publishable[] publishables,
         PublishingParameters parameters, bool strip_metadata) {
         base(session, publishables);
         
@@ -1009,7 +816,7 @@ internal class Uploader : Publishing.RESTSupport.BatchUploader {
     protected override Publishing.RESTSupport.Transaction create_transaction(
         Spit.Publishing.Publishable publishable) {
         preprocess_publishable(get_current_publishable());
-        return new UploadTransaction((Session) get_session(), parameters,
+        return new UploadTransaction((Publishing.RESTSupport.OAuth1.Session) get_session(), parameters,
             get_current_publishable());
     }
 }
diff --git a/plugins/shotwell-publishing/PicasaPublishing.c b/plugins/shotwell-publishing/PicasaPublishing.c
index 286f53b..4f597b8 100644
--- a/plugins/shotwell-publishing/PicasaPublishing.c
+++ b/plugins/shotwell-publishing/PicasaPublishing.c
@@ -1,4 +1,4 @@
-/* PicasaPublishing.c generated by valac 0.36.6, the Vala compiler
+/* PicasaPublishing.c generated by valac 0.40.4, the Vala compiler
  * generated from PicasaPublishing.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <shotwell-plugin-dev-1.0.h>
@@ -35,6 +36,11 @@
 typedef struct _PicasaService PicasaService;
 typedef struct _PicasaServiceClass PicasaServiceClass;
 typedef struct _PicasaServicePrivate PicasaServicePrivate;
+enum  {
+	PICASA_SERVICE_0_PROPERTY,
+	PICASA_SERVICE_NUM_PROPERTIES
+};
+static GParamSpec* picasa_service_properties[PICASA_SERVICE_NUM_PROPERTIES];
 #define _g_free0(var) (var = (g_free (var), NULL))
 
 #define PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER (publishing_picasa_picasa_publisher_get_type ())
@@ -57,6 +63,11 @@ typedef struct _PublishingPicasaPicasaPublisherPrivate PublishingPicasaPicasaPub
 
 typedef struct _PublishingPicasaPublishingParameters PublishingPicasaPublishingParameters;
 typedef struct _PublishingPicasaPublishingParametersClass PublishingPicasaPublishingParametersClass;
+enum  {
+	PUBLISHING_PICASA_PICASA_PUBLISHER_0_PROPERTY,
+	PUBLISHING_PICASA_PICASA_PUBLISHER_NUM_PROPERTIES
+};
+static GParamSpec* publishing_picasa_picasa_publisher_properties[PUBLISHING_PICASA_PICASA_PUBLISHER_NUM_PROPERTIES];
 #define _publishing_picasa_publishing_parameters_unref0(var) ((var == NULL) ? NULL : (var = (publishing_picasa_publishing_parameters_unref (var), NULL)))
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 
@@ -132,6 +143,11 @@ typedef struct _PublishingPicasaPublishingOptionsPanePrivate PublishingPicasaPub
 
 typedef struct _PublishingPicasaPublishingOptionsPaneSizeDescription PublishingPicasaPublishingOptionsPaneSizeDescription;
 typedef struct _PublishingPicasaPublishingOptionsPaneSizeDescriptionClass PublishingPicasaPublishingOptionsPaneSizeDescriptionClass;
+enum  {
+	PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_0_PROPERTY,
+	PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_picasa_publishing_options_pane_properties[PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_NUM_PROPERTIES];
 #define _g_slist_free0(var) ((var == NULL) ? NULL : (var = (g_slist_free (var), NULL)))
 typedef struct _PublishingPicasaPublishingOptionsPaneSizeDescriptionPrivate PublishingPicasaPublishingOptionsPaneSizeDescriptionPrivate;
 #define _publishing_picasa_publishing_options_pane_size_description_unref0(var) ((var == NULL) ? NULL : (var = (publishing_picasa_publishing_options_pane_size_description_unref (var), NULL)))
@@ -139,9 +155,9 @@ typedef struct _PublishingPicasaPublishingOptionsPaneParamSpecSizeDescription Pu
 enum  {
 	PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL,
 	PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL,
-	PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL
+	PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_NUM_SIGNALS
 };
-static guint publishing_picasa_publishing_options_pane_signals[PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0};
+static guint publishing_picasa_publishing_options_pane_signals[PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_NUM_SIGNALS] = {0};
 typedef struct _PublishingPicasaPublishingParametersPrivate PublishingPicasaPublishingParametersPrivate;
 #define _g_regex_unref0(var) ((var == NULL) ? NULL : (var = (g_regex_unref (var), NULL)))
 typedef struct _PublishingPicasaParamSpecPublishingParameters PublishingPicasaParamSpecPublishingParameters;
@@ -326,187 +342,284 @@ static gpointer publishing_picasa_publishing_parameters_parent_class = NULL;
 static gpointer publishing_picasa_uploader_parent_class = NULL;
 
 GType picasa_service_get_type (void) G_GNUC_CONST;
-enum  {
-	PICASA_SERVICE_DUMMY_PROPERTY
-};
 #define PICASA_SERVICE_ICON_FILENAME "picasa.png"
 PicasaService* picasa_service_new (GFile* resource_directory);
-PicasaService* picasa_service_construct (GType object_type, GFile* resource_directory);
-static gint picasa_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface);
+PicasaService* picasa_service_construct (GType object_type,
+                                         GFile* resource_directory);
+static gint picasa_service_real_get_pluggable_interface (SpitPluggable* base,
+                                                  gint min_host_interface,
+                                                  gint max_host_interface);
 static const gchar* picasa_service_real_get_id (SpitPluggable* base);
 static const gchar* picasa_service_real_get_pluggable_name (SpitPluggable* base);
-static void picasa_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info);
-static GdkPixbuf** _vala_array_dup4 (GdkPixbuf** self, int length);
-static SpitPublishingPublisher* picasa_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host);
-PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host);
-PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host);
+static void picasa_service_real_get_info (SpitPluggable* base,
+                                   SpitPluggableInfo* info);
+static GdkPixbuf** _vala_array_dup4 (GdkPixbuf** self,
+                              int length);
+static SpitPublishingPublisher* picasa_service_real_create_publisher (SpitPublishingService* base,
+                                                               SpitPublishingPluginHost* host);
+PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_new (SpitPublishingService* service,
+                                                                         SpitPublishingPluginHost* host);
+PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_construct (GType object_type,
+                                                                               SpitPublishingService* service,
+                                                                               SpitPublishingPluginHost* host);
 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_real_activation (SpitPluggable* base,
+                                     gboolean enabled);
 static void picasa_service_finalize (GObject * obj);
 #define PUBLISHING_PICASA_DEFAULT_ALBUM_NAME _ ("Shotwell Connect")
 gpointer publishing_picasa_publishing_parameters_ref (gpointer instance);
 void publishing_picasa_publishing_parameters_unref (gpointer instance);
-GParamSpec* publishing_picasa_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_picasa_value_set_publishing_parameters (GValue* value, gpointer v_object);
-void publishing_picasa_value_take_publishing_parameters (GValue* value, gpointer v_object);
+GParamSpec* publishing_picasa_param_spec_publishing_parameters (const gchar* name,
+                                                                const gchar* nick,
+                                                                const gchar* blurb,
+                                                                GType object_type,
+                                                                GParamFlags flags);
+void publishing_picasa_value_set_publishing_parameters (GValue* value,
+                                                        gpointer v_object);
+void publishing_picasa_value_take_publishing_parameters (GValue* value,
+                                                         gpointer v_object);
 gpointer publishing_picasa_value_get_publishing_parameters (const GValue* value);
 GType publishing_picasa_publishing_parameters_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_PICASA_PICASA_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, PublishingPicasaPicasaPublisherPrivate))
-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);
-void publishing_picasa_publishing_parameters_set_media_type (PublishingPicasaPublishingParameters* self, SpitPublishingPublisherMediaType media_type);
+static void publishing_picasa_picasa_publisher_load_parameters_from_configuration_system (PublishingPicasaPicasaPublisher* self,
+                                                                                   PublishingPicasaPublishingParameters* parameters);
+void publishing_picasa_publishing_parameters_set_media_type (PublishingPicasaPublishingParameters* self,
+                                                             SpitPublishingPublisherMediaType media_type);
 gpointer publishing_picasa_album_ref (gpointer instance);
 void publishing_picasa_album_unref (gpointer instance);
-GParamSpec* publishing_picasa_param_spec_album (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_picasa_value_set_album (GValue* value, gpointer v_object);
-void publishing_picasa_value_take_album (GValue* value, gpointer v_object);
+GParamSpec* publishing_picasa_param_spec_album (const gchar* name,
+                                                const gchar* nick,
+                                                const gchar* blurb,
+                                                GType object_type,
+                                                GParamFlags flags);
+void publishing_picasa_value_set_album (GValue* value,
+                                        gpointer v_object);
+void publishing_picasa_value_take_album (GValue* value,
+                                         gpointer v_object);
 gpointer publishing_picasa_value_get_album (const GValue* value);
 GType publishing_picasa_album_get_type (void) G_GNUC_CONST;
-static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums_helper (PublishingPicasaPicasaPublisher* self, xmlNode* document_root, int* result_length1, GError** error);
-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);
-static void publishing_picasa_picasa_publisher_save_parameters_to_configuration_system (PublishingPicasaPicasaPublisher* self, PublishingPicasaPublishingParameters* parameters);
+static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums_helper (PublishingPicasaPicasaPublisher* self,
+                                                                                  xmlNode* document_root,
+                                                                                  int* result_length1,
+                                                                                  GError** error);
+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_add13 (PublishingPicasaAlbum** * array,
+                        int* length,
+                        int* size,
+                        PublishingPicasaAlbum* value);
+static void _vala_array_add14 (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);
+static void publishing_picasa_picasa_publisher_save_parameters_to_configuration_system (PublishingPicasaPicasaPublisher* self,
+                                                                                 PublishingPicasaPublishingParameters* parameters);
 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_real_on_login_flow_complete (PublishingRESTSupportGooglePublisher* base);
-void publishing_picasa_publishing_parameters_set_user_name (PublishingPicasaPublishingParameters* self, const gchar* user_name);
+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);
-static void publishing_picasa_picasa_publisher_on_initial_album_fetch_complete (PublishingPicasaPicasaPublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_picasa_picasa_publisher_on_initial_album_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_picasa_picasa_publisher_on_initial_album_fetch_error (PublishingPicasaPicasaPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err);
-static void _publishing_picasa_picasa_publisher_on_initial_album_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
+static void publishing_picasa_picasa_publisher_on_initial_album_fetch_complete (PublishingPicasaPicasaPublisher* self,
+                                                                         PublishingRESTSupportTransaction* txn);
+static void _publishing_picasa_picasa_publisher_on_initial_album_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                                        gpointer self);
+static void publishing_picasa_picasa_publisher_on_initial_album_fetch_error (PublishingPicasaPicasaPublisher* self,
+                                                                      PublishingRESTSupportTransaction* bad_txn,
+                                                                      GError* err);
+static void _publishing_picasa_picasa_publisher_on_initial_album_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                                         GError* err,
+                                                                                                                         gpointer self);
 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_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);
 static void publishing_picasa_picasa_publisher_do_upload (PublishingPicasaPicasaPublisher* self);
-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_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);
 PublishingPicasaAlbumDirectoryTransaction* publishing_picasa_album_directory_transaction_new (PublishingRESTSupportGoogleSession* session);
-PublishingPicasaAlbumDirectoryTransaction* publishing_picasa_album_directory_transaction_construct (GType object_type, 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 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, 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);
+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);
 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);
-PublishingPicasaUploader* publishing_picasa_uploader_construct (GType object_type, PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingPicasaPublishingParameters* parameters);
-static void _publishing_picasa_picasa_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self);
+PublishingPicasaUploader* publishing_picasa_uploader_new (PublishingRESTSupportGoogleSession* session,
+                                                          SpitPublishingPublishable** publishables,
+                                                          int publishables_length1,
+                                                          PublishingPicasaPublishingParameters* parameters);
+PublishingPicasaUploader* publishing_picasa_uploader_construct (GType object_type,
+                                                                PublishingRESTSupportGoogleSession* session,
+                                                                SpitPublishingPublishable** publishables,
+                                                                int publishables_length1,
+                                                                PublishingPicasaPublishingParameters* parameters);
+static void _publishing_picasa_picasa_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number,
+                                                                                                     gdouble fraction_complete,
+                                                                                                     gpointer self);
 static void publishing_picasa_picasa_publisher_real_do_logout (PublishingRESTSupportGooglePublisher* base);
 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
-};
 static void publishing_picasa_album_finalize (PublishingPicasaAlbum * obj);
-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"
 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  {
-	PUBLISHING_PICASA_UPLOAD_TRANSACTION_DUMMY_PROPERTY
-};
 #define PUBLISHING_PICASA_UPLOAD_TRANSACTION_METADATA_TEMPLATE "<?xml version=\"1.0\" ?><atom:entry xmlns:atom='http://www.w3.org/2005" \
 "/Atom' xmlns:mrss='http://search.yahoo.com/mrss/'> <atom:title>%s</ato" \
 "m:title> %s <atom:category scheme='http://schemas.google.com/g/2005#ki" \
 "nd' term='http://schemas.google.com/photos/2007#photo'/> %s </atom:ent" \
 "ry>"
-PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_new (PublishingRESTSupportGoogleSession* session, PublishingPicasaPublishingParameters* parameters, SpitPublishingPublishable* publishable);
-PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session, PublishingPicasaPublishingParameters* parameters, SpitPublishingPublishable* publishable);
+PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_new (PublishingRESTSupportGoogleSession* session,
+                                                                             PublishingPicasaPublishingParameters* parameters,
+                                                                             SpitPublishingPublishable* publishable);
+PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_construct (GType object_type,
+                                                                                   PublishingRESTSupportGoogleSession* session,
+                                                                                   PublishingPicasaPublishingParameters* parameters,
+                                                                                   SpitPublishingPublishable* publishable);
 gchar* publishing_picasa_publishing_parameters_get_target_album_feed_url (PublishingPicasaPublishingParameters* self);
-static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error);
+static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSupportTransaction* base,
+                                                        GError** error);
 static void _vala_SoupBuffer_free (SoupBuffer* self);
 static void _vala_SoupMultipart_free (SoupMultipart* self);
 static void publishing_picasa_upload_transaction_finalize (PublishingRESTSupportTransaction * obj);
 static gpointer publishing_picasa_publishing_options_pane_size_description_ref (gpointer instance);
 static void publishing_picasa_publishing_options_pane_size_description_unref (gpointer instance);
-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) G_GNUC_UNUSED;
-static void publishing_picasa_publishing_options_pane_value_set_size_description (GValue* value, gpointer v_object) G_GNUC_UNUSED;
-static void publishing_picasa_publishing_options_pane_value_take_size_description (GValue* value, gpointer v_object) G_GNUC_UNUSED;
+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) G_GNUC_UNUSED;
+static void publishing_picasa_publishing_options_pane_value_set_size_description (GValue* value,
+                                                                           gpointer v_object) G_GNUC_UNUSED;
+static void publishing_picasa_publishing_options_pane_value_take_size_description (GValue* value,
+                                                                            gpointer v_object) G_GNUC_UNUSED;
 static gpointer publishing_picasa_publishing_options_pane_value_get_size_description (const GValue* value) G_GNUC_UNUSED;
 static GType publishing_picasa_publishing_options_pane_size_description_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 #define PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPicasaPublishingOptionsPanePrivate))
-enum  {
-	PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_DUMMY_PROPERTY
-};
 #define PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_DEFAULT_SIZE_CONFIG_KEY "default_size"
 #define PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_LAST_ALBUM_CONFIG_KEY "last_album"
-static PublishingPicasaPublishingOptionsPaneSizeDescription** publishing_picasa_publishing_options_pane_create_size_descriptions (PublishingPicasaPublishingOptionsPane* self, int* result_length1);
+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_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_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_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_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);
-static void _vala_array_add17 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value);
+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_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_add15 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array,
+                        int* length,
+                        int* size,
+                        PublishingPicasaPublishingOptionsPaneSizeDescription* value);
+static void _vala_array_add16 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array,
+                        int* length,
+                        int* size,
+                        PublishingPicasaPublishingOptionsPaneSizeDescription* value);
+static void _vala_array_add17 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array,
+                        int* length,
+                        int* size,
+                        PublishingPicasaPublishingOptionsPaneSizeDescription* value);
+static void _vala_array_add18 (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);
+static void _vala_array_add19 (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);
 static void publishing_picasa_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
 static void publishing_picasa_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
-enum  {
-	PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_SIZE_DESCRIPTION_DUMMY_PROPERTY
-};
 static void publishing_picasa_publishing_options_pane_size_description_finalize (PublishingPicasaPublishingOptionsPaneSizeDescription * obj);
 static void publishing_picasa_publishing_options_pane_finalize (GObject * obj);
 #define PUBLISHING_PICASA_PUBLISHING_PARAMETERS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS, PublishingPicasaPublishingParametersPrivate))
-enum  {
-	PUBLISHING_PICASA_PUBLISHING_PARAMETERS_DUMMY_PROPERTY
-};
 gchar* publishing_picasa_publishing_parameters_get_target_album_entry_url (PublishingPicasaPublishingParameters* self);
-static PublishingPicasaAlbum** _vala_array_dup5 (PublishingPicasaAlbum** self, int length);
-static PublishingPicasaAlbum** _vala_array_dup6 (PublishingPicasaAlbum** self, int length);
+static PublishingPicasaAlbum** _vala_array_dup5 (PublishingPicasaAlbum** self,
+                                          int length);
+static PublishingPicasaAlbum** _vala_array_dup6 (PublishingPicasaAlbum** self,
+                                          int length);
 static void publishing_picasa_publishing_parameters_finalize (PublishingPicasaPublishingParameters * obj);
 #define PUBLISHING_PICASA_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PICASA_TYPE_UPLOADER, PublishingPicasaUploaderPrivate))
-enum  {
-	PUBLISHING_PICASA_UPLOADER_DUMMY_PROPERTY
-};
-static PublishingRESTSupportTransaction* publishing_picasa_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable);
+static PublishingRESTSupportTransaction* publishing_picasa_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base,
+                                                                                      SpitPublishingPublishable* publishable);
 static void publishing_picasa_uploader_finalize (PublishingRESTSupportBatchUploader * obj);
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
+static void _vala_array_destroy (gpointer array,
+                          gint array_length,
+                          GDestroyNotify destroy_func);
+static void _vala_array_free (gpointer array,
+                       gint array_length,
+                       GDestroyNotify destroy_func);
 static gint _vala_array_length (gpointer array);
 
 
-PicasaService* picasa_service_construct (GType object_type, GFile* resource_directory) {
+PicasaService*
+picasa_service_construct (GType object_type,
+                          GFile* resource_directory)
+{
 	PicasaService * self = NULL;
 	GdkPixbuf** _tmp0_;
 	gint _tmp0__length1;
@@ -520,7 +633,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 519 "PicasaPublishing.c"
+#line 632 "PicasaPublishing.c"
 		gint _tmp1_;
 		GdkPixbuf** _tmp2_;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -533,44 +646,43 @@ 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 532 "PicasaPublishing.c"
+#line 645 "PicasaPublishing.c"
 	}
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 536 "PicasaPublishing.c"
+#line 649 "PicasaPublishing.c"
 }
 
 
-PicasaService* picasa_service_new (GFile* resource_directory) {
+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 543 "PicasaPublishing.c"
+#line 658 "PicasaPublishing.c"
 }
 
 
-static gint picasa_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) {
+static gint
+picasa_service_real_get_pluggable_interface (SpitPluggable* base,
+                                             gint min_host_interface,
+                                             gint max_host_interface)
+{
 	PicasaService * self;
 	gint result = 0;
-	gint _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
 #line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PICASA_SERVICE, PicasaService);
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = min_host_interface;
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp1_ = max_host_interface;
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp2_ = spit_negotiate_interfaces (_tmp0_, _tmp1_, SPIT_PUBLISHING_CURRENT_INTERFACE);
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	result = _tmp2_;
+	result = spit_negotiate_interfaces (min_host_interface, max_host_interface, SPIT_PUBLISHING_CURRENT_INTERFACE);
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 565 "PicasaPublishing.c"
+#line 675 "PicasaPublishing.c"
 }
 
 
-static const gchar* picasa_service_real_get_id (SpitPluggable* base) {
+static const gchar*
+picasa_service_real_get_id (SpitPluggable* base)
+{
 	PicasaService * self;
 	const gchar* result = NULL;
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -579,11 +691,13 @@ 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 578 "PicasaPublishing.c"
+#line 690 "PicasaPublishing.c"
 }
 
 
-static const gchar* picasa_service_real_get_pluggable_name (SpitPluggable* base) {
+static const gchar*
+picasa_service_real_get_pluggable_name (SpitPluggable* base)
+{
 	PicasaService * self;
 	const gchar* result = NULL;
 #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -592,39 +706,47 @@ 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 591 "PicasaPublishing.c"
+#line 705 "PicasaPublishing.c"
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+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 598 "PicasaPublishing.c"
+#line 714 "PicasaPublishing.c"
 }
 
 
-static GdkPixbuf** _vala_array_dup4 (GdkPixbuf** self, int length) {
+static GdkPixbuf**
+_vala_array_dup4 (GdkPixbuf** self,
+                  int length)
+{
 	GdkPixbuf** result;
 	int i;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = g_new0 (GdkPixbuf*, length + 1);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 609 "PicasaPublishing.c"
+#line 728 "PicasaPublishing.c"
 		GdkPixbuf* _tmp0_;
 #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 615 "PicasaPublishing.c"
+#line 734 "PicasaPublishing.c"
 	}
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 619 "PicasaPublishing.c"
+#line 738 "PicasaPublishing.c"
 }
 
 
-static void picasa_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) {
+static void
+picasa_service_real_get_info (SpitPluggable* base,
+                              SpitPluggableInfo* info)
+{
 	PicasaService * self;
 	gchar* _tmp0_;
 	gchar* _tmp1_;
@@ -699,32 +821,34 @@ static void picasa_service_real_get_info (SpitPluggable* base, SpitPluggableInfo
 	(*info).icons = _tmp8_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*info).icons_length1 = _tmp8__length1;
-#line 698 "PicasaPublishing.c"
+#line 820 "PicasaPublishing.c"
 }
 
 
-static SpitPublishingPublisher* picasa_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) {
+static SpitPublishingPublisher*
+picasa_service_real_create_publisher (SpitPublishingService* base,
+                                      SpitPublishingPluginHost* host)
+{
 	PicasaService * self;
 	SpitPublishingPublisher* result = NULL;
-	SpitPublishingPluginHost* _tmp0_;
-	PublishingPicasaPicasaPublisher* _tmp1_;
+	PublishingPicasaPicasaPublisher* _tmp0_;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PICASA_SERVICE, PicasaService);
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = host;
+	_tmp0_ = publishing_picasa_picasa_publisher_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService), host);
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp1_ = publishing_picasa_picasa_publisher_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService), _tmp0_);
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
+	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 719 "PicasaPublishing.c"
+#line 841 "PicasaPublishing.c"
 }
 
 
-static SpitPublishingPublisherMediaType picasa_service_real_get_supported_media (SpitPublishingService* base) {
+static SpitPublishingPublisherMediaType
+picasa_service_real_get_supported_media (SpitPublishingService* base)
+{
 	PicasaService * self;
 	SpitPublishingPublisherMediaType result = 0;
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -733,28 +857,35 @@ 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 732 "PicasaPublishing.c"
+#line 856 "PicasaPublishing.c"
 }
 
 
-static void picasa_service_real_activation (SpitPluggable* base, gboolean enabled) {
+static void
+picasa_service_real_activation (SpitPluggable* base,
+                                gboolean enabled)
+{
 	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 740 "PicasaPublishing.c"
+#line 867 "PicasaPublishing.c"
 }
 
 
-static void picasa_service_class_init (PicasaServiceClass * klass) {
+static void
+picasa_service_class_init (PicasaServiceClass * klass)
+{
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	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 749 "PicasaPublishing.c"
+#line 878 "PicasaPublishing.c"
 }
 
 
-static void picasa_service_spit_pluggable_interface_init (SpitPluggableIface * iface) {
+static void
+picasa_service_spit_pluggable_interface_init (SpitPluggableIface * iface)
+{
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	picasa_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -767,36 +898,44 @@ 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 766 "PicasaPublishing.c"
+#line 897 "PicasaPublishing.c"
 }
 
 
-static void picasa_service_spit_publishing_service_interface_init (SpitPublishingServiceIface * iface) {
+static void
+picasa_service_spit_publishing_service_interface_init (SpitPublishingServiceIface * iface)
+{
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	picasa_service_spit_publishing_service_parent_iface = g_type_interface_peek_parent (iface);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	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 777 "PicasaPublishing.c"
+#line 910 "PicasaPublishing.c"
 }
 
 
-static void picasa_service_instance_init (PicasaService * self) {
+static void
+picasa_service_instance_init (PicasaService * self)
+{
 }
 
 
-static void picasa_service_finalize (GObject * obj) {
+static void
+picasa_service_finalize (GObject * obj)
+{
 	PicasaService * self;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	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 791 "PicasaPublishing.c"
+#line 928 "PicasaPublishing.c"
 }
 
 
-GType picasa_service_get_type (void) {
+GType
+picasa_service_get_type (void)
+{
 	static volatile gsize picasa_service_type_id__volatile = 0;
 	if (g_once_init_enter (&picasa_service_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PicasaServiceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) picasa_service_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PicasaService), 0, (GInstanceInitFunc) picasa_service_instance_init, NULL };
@@ -812,91 +951,83 @@ GType picasa_service_get_type (void) {
 }
 
 
-PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) {
+PublishingPicasaPicasaPublisher*
+publishing_picasa_picasa_publisher_construct (GType object_type,
+                                              SpitPublishingService* service,
+                                              SpitPublishingPluginHost* host)
+{
 	PublishingPicasaPicasaPublisher * self = NULL;
-	SpitPublishingService* _tmp0_;
-	SpitPublishingPluginHost* _tmp1_;
-	PublishingPicasaPublishingParameters* _tmp2_;
-	PublishingPicasaPublishingParameters* _tmp3_;
+	PublishingPicasaPublishingParameters* _tmp0_;
+	PublishingPicasaPublishingParameters* _tmp1_;
 	SpitPublishingPublisherMediaType media_type = 0;
-	SpitPublishingPluginHost* _tmp4_;
-	gint _tmp5_;
-	SpitPublishingPublishable** _tmp6_;
-	PublishingPicasaPublishingParameters* _tmp11_;
-	SpitPublishingPublisherMediaType _tmp12_;
+	gint _tmp2_;
+	SpitPublishingPublishable** _tmp3_;
+	PublishingPicasaPublishingParameters* _tmp7_;
+	SpitPublishingPublisherMediaType _tmp8_;
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = service;
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp1_ = host;
-#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/");
+	self = (PublishingPicasaPicasaPublisher*) publishing_rest_support_google_publisher_construct (object_type, service, host, "https://picasaweb.google.com/data/");
 #line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp2_ = publishing_picasa_publishing_parameters_new ();
+	_tmp0_ = publishing_picasa_publishing_parameters_new ();
 #line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_picasa_publishing_parameters_unref0 (self->priv->publishing_parameters);
 #line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->publishing_parameters = _tmp2_;
+	self->priv->publishing_parameters = _tmp0_;
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp3_ = self->priv->publishing_parameters;
+	_tmp1_ = self->priv->publishing_parameters;
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_picasa_picasa_publisher_load_parameters_from_configuration_system (self, _tmp3_);
+	publishing_picasa_picasa_publisher_load_parameters_from_configuration_system (self, _tmp1_);
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	media_type = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_NONE;
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp4_ = host;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp6_ = spit_publishing_plugin_host_get_publishables (_tmp4_, &_tmp5_);
-#line 849 "PicasaPublishing.c"
+	_tmp3_ = spit_publishing_plugin_host_get_publishables (host, &_tmp2_);
+#line 983 "PicasaPublishing.c"
 	{
 		SpitPublishingPublishable** p_collection = NULL;
 		gint p_collection_length1 = 0;
 		gint _p_collection_size_ = 0;
 		gint p_it = 0;
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		p_collection = _tmp6_;
+		p_collection = _tmp3_;
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		p_collection_length1 = _tmp5_;
+		p_collection_length1 = _tmp2_;
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		for (p_it = 0; p_it < _tmp5_; p_it = p_it + 1) {
-#line 861 "PicasaPublishing.c"
-			SpitPublishingPublishable* _tmp7_;
+		for (p_it = 0; p_it < _tmp2_; p_it = p_it + 1) {
+#line 995 "PicasaPublishing.c"
+			SpitPublishingPublishable* _tmp4_;
 			SpitPublishingPublishable* p = NULL;
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp7_ = _g_object_ref0 (p_collection[p_it]);
+			_tmp4_ = _g_object_ref0 (p_collection[p_it]);
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			p = _tmp7_;
-#line 868 "PicasaPublishing.c"
+			p = _tmp4_;
+#line 1002 "PicasaPublishing.c"
 			{
-				SpitPublishingPublisherMediaType _tmp8_;
-				SpitPublishingPublishable* _tmp9_;
-				SpitPublishingPublisherMediaType _tmp10_;
+				SpitPublishingPublisherMediaType _tmp5_;
+				SpitPublishingPublishable* _tmp6_;
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-				_tmp8_ = media_type;
+				_tmp5_ = media_type;
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-				_tmp9_ = p;
+				_tmp6_ = p;
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-				_tmp10_ = spit_publishing_publishable_get_media_type (_tmp9_);
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-				media_type = _tmp8_ | _tmp10_;
+				media_type = _tmp5_ | spit_publishing_publishable_get_media_type (_tmp6_);
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_g_object_unref0 (p);
-#line 883 "PicasaPublishing.c"
+#line 1014 "PicasaPublishing.c"
 			}
 		}
 #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 888 "PicasaPublishing.c"
+#line 1019 "PicasaPublishing.c"
 	}
 #line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp11_ = self->priv->publishing_parameters;
+	_tmp7_ = self->priv->publishing_parameters;
 #line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp12_ = media_type;
+	_tmp8_ = media_type;
 #line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_picasa_publishing_parameters_set_media_type (_tmp11_, _tmp12_);
+	publishing_picasa_publishing_parameters_set_media_type (_tmp7_, _tmp8_);
 #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 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -913,65 +1044,82 @@ PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_construct (G
 	self->priv->progress_reporter_target_destroy_notify = NULL;
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 912 "PicasaPublishing.c"
+#line 1043 "PicasaPublishing.c"
 }
 
 
-PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
+PublishingPicasaPicasaPublisher*
+publishing_picasa_picasa_publisher_new (SpitPublishingService* service,
+                                        SpitPublishingPluginHost* host)
+{
 #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 919 "PicasaPublishing.c"
+#line 1053 "PicasaPublishing.c"
 }
 
 
-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)
+{
 #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 930 "PicasaPublishing.c"
+#line 1069 "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 936 "PicasaPublishing.c"
+#line 1075 "PicasaPublishing.c"
 }
 
 
-static void _vala_array_add13 (PublishingPicasaAlbum** * array, int* length, int* size, PublishingPicasaAlbum* value) {
+static void
+_vala_array_add14 (PublishingPicasaAlbum** * array,
+                   int* length,
+                   int* size,
+                   PublishingPicasaAlbum* value)
+{
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if ((*length) == (*size)) {
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*array = g_renew (PublishingPicasaAlbum*, *array, (*size) + 1);
-#line 947 "PicasaPublishing.c"
+#line 1091 "PicasaPublishing.c"
 	}
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[*length] = NULL;
-#line 953 "PicasaPublishing.c"
+#line 1097 "PicasaPublishing.c"
 }
 
 
-static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums_helper (PublishingPicasaPicasaPublisher* self, xmlNode* document_root, int* result_length1, GError** error) {
+static PublishingPicasaAlbum**
+publishing_picasa_picasa_publisher_extract_albums_helper (PublishingPicasaPicasaPublisher* self,
+                                                          xmlNode* document_root,
+                                                          int* result_length1,
+                                                          GError** error)
+{
 	PublishingPicasaAlbum** result = NULL;
 	PublishingPicasaAlbum** _result_ = NULL;
 	PublishingPicasaAlbum** _tmp0_;
 	gint _result__length1;
 	gint __result__size_;
 	xmlNode* doc_node_iter = NULL;
-	xmlNode* _tmp1_;
-	const gchar* _tmp2_;
-	PublishingPicasaAlbum** _tmp9_;
-	gint _tmp9__length1;
-	PublishingPicasaAlbum* _tmp10_;
-	PublishingPicasaAlbum** _tmp39_;
-	gint _tmp39__length1;
+	const gchar* _tmp1_;
+	PublishingPicasaAlbum** _tmp5_;
+	gint _tmp5__length1;
+	PublishingPicasaAlbum* _tmp6_;
+	PublishingPicasaAlbum** _tmp35_;
+	gint _tmp35__length1;
 	GError * _inner_error_ = NULL;
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self), NULL);
@@ -986,43 +1134,31 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
 #line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	doc_node_iter = NULL;
 #line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp1_ = document_root;
+	_tmp1_ = document_root->name;
 #line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp2_ = _tmp1_->name;
-#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (g_strcmp0 (_tmp2_, "feed") == 0) {
-#line 990 "PicasaPublishing.c"
-		xmlNode* _tmp3_;
-		xmlNode* _tmp4_;
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp3_ = document_root;
+	if (g_strcmp0 (_tmp1_, "feed") == 0) {
+#line 1136 "PicasaPublishing.c"
+		xmlNode* _tmp2_;
 #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp4_ = _tmp3_->children;
+		_tmp2_ = document_root->children;
 #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		doc_node_iter = _tmp4_;
-#line 999 "PicasaPublishing.c"
+		doc_node_iter = _tmp2_;
+#line 1142 "PicasaPublishing.c"
 	} else {
-		xmlNode* _tmp5_;
-		const gchar* _tmp6_;
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp5_ = document_root;
+		const gchar* _tmp3_;
 #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp6_ = _tmp5_->name;
+		_tmp3_ = document_root->name;
 #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		if (g_strcmp0 (_tmp6_, "entry") == 0) {
-#line 1009 "PicasaPublishing.c"
-			xmlNode* _tmp7_;
+		if (g_strcmp0 (_tmp3_, "entry") == 0) {
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp7_ = document_root;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			doc_node_iter = _tmp7_;
-#line 1015 "PicasaPublishing.c"
+			doc_node_iter = document_root;
+#line 1151 "PicasaPublishing.c"
 		} else {
-			GError* _tmp8_;
+			GError* _tmp4_;
 #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>");
+			_tmp4_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "response root node " "isn't a <feed> or <entry>");
 #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_inner_error_ = _tmp8_;
+			_inner_error_ = _tmp4_;
 #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1031,7 +1167,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
 				_result_ = (_vala_array_free (_result_, _result__length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
 #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				return NULL;
-#line 1030 "PicasaPublishing.c"
+#line 1166 "PicasaPublishing.c"
 			} else {
 #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_result_ = (_vala_array_free (_result_, _result__length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
@@ -1041,282 +1177,268 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
 				g_clear_error (&_inner_error_);
 #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				return NULL;
-#line 1040 "PicasaPublishing.c"
+#line 1176 "PicasaPublishing.c"
 			}
 		}
 	}
 #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp9_ = _result_;
+	_tmp5_ = _result_;
 #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp9__length1 = _result__length1;
+	_tmp5__length1 = _result__length1;
 #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp10_ = publishing_picasa_album_new (_ ("Default album"), PUBLISHING_PICASA_PICASA_PUBLISHER_DEFAULT_ALBUM_FEED_URL);
+	_tmp6_ = publishing_picasa_album_new (_ ("Default album"), 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_, _tmp10_);
-#line 1052 "PicasaPublishing.c"
+	_vala_array_add13 (&_result_, &_result__length1, &__result__size_, _tmp6_);
+#line 1188 "PicasaPublishing.c"
 	{
-		gboolean _tmp11_ = FALSE;
+		gboolean _tmp7_ = FALSE;
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp11_ = TRUE;
+		_tmp7_ = TRUE;
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		while (TRUE) {
-#line 1059 "PicasaPublishing.c"
-			xmlNode* _tmp14_;
-			xmlNode* _tmp15_;
-			const gchar* _tmp16_;
+#line 1195 "PicasaPublishing.c"
+			xmlNode* _tmp10_;
+			xmlNode* _tmp11_;
+			const gchar* _tmp12_;
 			gchar* name_val = NULL;
 			gchar* url_val = NULL;
 			xmlNode* album_node_iter = NULL;
-			xmlNode* _tmp17_;
-			xmlNode* _tmp18_;
-			const gchar* _tmp34_;
-			PublishingPicasaAlbum** _tmp35_;
-			gint _tmp35__length1;
-			const gchar* _tmp36_;
-			const gchar* _tmp37_;
-			PublishingPicasaAlbum* _tmp38_;
+			xmlNode* _tmp13_;
+			xmlNode* _tmp14_;
+			const gchar* _tmp30_;
+			PublishingPicasaAlbum** _tmp31_;
+			gint _tmp31__length1;
+			const gchar* _tmp32_;
+			const gchar* _tmp33_;
+			PublishingPicasaAlbum* _tmp34_;
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			if (!_tmp11_) {
-#line 1076 "PicasaPublishing.c"
-				xmlNode* _tmp12_;
-				xmlNode* _tmp13_;
+			if (!_tmp7_) {
+#line 1212 "PicasaPublishing.c"
+				xmlNode* _tmp8_;
+				xmlNode* _tmp9_;
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-				_tmp12_ = doc_node_iter;
+				_tmp8_ = doc_node_iter;
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-				_tmp13_ = _tmp12_->next;
+				_tmp9_ = _tmp8_->next;
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-				doc_node_iter = _tmp13_;
-#line 1085 "PicasaPublishing.c"
+				doc_node_iter = _tmp9_;
+#line 1221 "PicasaPublishing.c"
 			}
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp11_ = FALSE;
+			_tmp7_ = FALSE;
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp14_ = doc_node_iter;
+			_tmp10_ = doc_node_iter;
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			if (!(_tmp14_ != NULL)) {
+			if (!(_tmp10_ != NULL)) {
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				break;
-#line 1095 "PicasaPublishing.c"
+#line 1231 "PicasaPublishing.c"
 			}
 #line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp15_ = doc_node_iter;
+			_tmp11_ = doc_node_iter;
 #line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp16_ = _tmp15_->name;
+			_tmp12_ = _tmp11_->name;
 #line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			if (g_strcmp0 (_tmp16_, "entry") != 0) {
+			if (g_strcmp0 (_tmp12_, "entry") != 0) {
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				continue;
-#line 1105 "PicasaPublishing.c"
+#line 1241 "PicasaPublishing.c"
 			}
 #line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			name_val = NULL;
 #line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			url_val = NULL;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp17_ = doc_node_iter;
+			_tmp13_ = doc_node_iter;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp18_ = _tmp17_->children;
+			_tmp14_ = _tmp13_->children;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			album_node_iter = _tmp18_;
-#line 1117 "PicasaPublishing.c"
+			album_node_iter = _tmp14_;
+#line 1253 "PicasaPublishing.c"
 			{
-				gboolean _tmp19_ = FALSE;
+				gboolean _tmp15_ = FALSE;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-				_tmp19_ = TRUE;
+				_tmp15_ = TRUE;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				while (TRUE) {
-#line 1124 "PicasaPublishing.c"
-					xmlNode* _tmp22_;
-					xmlNode* _tmp23_;
-					const gchar* _tmp24_;
+#line 1260 "PicasaPublishing.c"
+					xmlNode* _tmp18_;
+					xmlNode* _tmp19_;
+					const gchar* _tmp20_;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					if (!_tmp19_) {
-#line 1130 "PicasaPublishing.c"
-						xmlNode* _tmp20_;
-						xmlNode* _tmp21_;
+					if (!_tmp15_) {
+#line 1266 "PicasaPublishing.c"
+						xmlNode* _tmp16_;
+						xmlNode* _tmp17_;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp20_ = album_node_iter;
+						_tmp16_ = album_node_iter;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp21_ = _tmp20_->next;
+						_tmp17_ = _tmp16_->next;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						album_node_iter = _tmp21_;
-#line 1139 "PicasaPublishing.c"
+						album_node_iter = _tmp17_;
+#line 1275 "PicasaPublishing.c"
 					}
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp19_ = FALSE;
+					_tmp15_ = FALSE;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp22_ = album_node_iter;
+					_tmp18_ = album_node_iter;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					if (!(_tmp22_ != NULL)) {
+					if (!(_tmp18_ != NULL)) {
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						break;
-#line 1149 "PicasaPublishing.c"
+#line 1285 "PicasaPublishing.c"
 					}
 #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp23_ = album_node_iter;
+					_tmp19_ = album_node_iter;
 #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp24_ = _tmp23_->name;
+					_tmp20_ = _tmp19_->name;
 #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					if (g_strcmp0 (_tmp24_, "title") == 0) {
-#line 1157 "PicasaPublishing.c"
-						xmlNode* _tmp25_;
-						gchar* _tmp26_;
+					if (g_strcmp0 (_tmp20_, "title") == 0) {
+#line 1293 "PicasaPublishing.c"
+						xmlNode* _tmp21_;
+						gchar* _tmp22_;
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp25_ = album_node_iter;
+						_tmp21_ = album_node_iter;
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp26_ = (gchar*) xmlNodeGetContent (_tmp25_);
+						_tmp22_ = (gchar*) xmlNodeGetContent (_tmp21_);
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_g_free0 (name_val);
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						name_val = _tmp26_;
-#line 1168 "PicasaPublishing.c"
+						name_val = _tmp22_;
+#line 1304 "PicasaPublishing.c"
 					} else {
-						xmlNode* _tmp27_;
-						const gchar* _tmp28_;
+						xmlNode* _tmp23_;
+						const gchar* _tmp24_;
 #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp27_ = album_node_iter;
+						_tmp23_ = album_node_iter;
 #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp28_ = _tmp27_->name;
+						_tmp24_ = _tmp23_->name;
 #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						if (g_strcmp0 (_tmp28_, "id") == 0) {
-#line 1178 "PicasaPublishing.c"
-							xmlNode* _tmp29_;
-							xmlNs* _tmp30_;
-							const gchar* _tmp31_;
-							xmlNode* _tmp32_;
-							gchar* _tmp33_;
+						if (g_strcmp0 (_tmp24_, "id") == 0) {
+#line 1314 "PicasaPublishing.c"
+							xmlNode* _tmp25_;
+							xmlNs* _tmp26_;
+							const gchar* _tmp27_;
+							xmlNode* _tmp28_;
+							gchar* _tmp29_;
 #line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-							_tmp29_ = album_node_iter;
+							_tmp25_ = album_node_iter;
 #line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-							_tmp30_ = _tmp29_->ns;
+							_tmp26_ = _tmp25_->ns;
 #line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-							_tmp31_ = _tmp30_->prefix;
+							_tmp27_ = _tmp26_->prefix;
 #line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-							if (_tmp31_ != NULL) {
+							if (_tmp27_ != NULL) {
 #line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 								continue;
-#line 1194 "PicasaPublishing.c"
+#line 1330 "PicasaPublishing.c"
 							}
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-							_tmp32_ = album_node_iter;
+							_tmp28_ = album_node_iter;
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-							_tmp33_ = (gchar*) xmlNodeGetContent (_tmp32_);
+							_tmp29_ = (gchar*) xmlNodeGetContent (_tmp28_);
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 							_g_free0 (url_val);
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-							url_val = _tmp33_;
-#line 1204 "PicasaPublishing.c"
+							url_val = _tmp29_;
+#line 1340 "PicasaPublishing.c"
 						}
 					}
 				}
 			}
 #line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp34_ = url_val;
+			_tmp30_ = url_val;
 #line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			if (g_strcmp0 (_tmp34_, PUBLISHING_PICASA_PICASA_PUBLISHER_DEFAULT_ALBUM_FEED_URL) == 0) {
+			if (g_strcmp0 (_tmp30_, 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 1355 "PicasaPublishing.c"
 			}
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp35_ = _result_;
+			_tmp31_ = _result_;
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp35__length1 = _result__length1;
+			_tmp31__length1 = _result__length1;
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp36_ = name_val;
+			_tmp32_ = name_val;
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp37_ = url_val;
+			_tmp33_ = url_val;
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp38_ = publishing_picasa_album_new (_tmp36_, _tmp37_);
+			_tmp34_ = publishing_picasa_album_new (_tmp32_, _tmp33_);
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_vala_array_add13 (&_result_, &_result__length1, &__result__size_, _tmp38_);
+			_vala_array_add14 (&_result_, &_result__length1, &__result__size_, _tmp34_);
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_free0 (url_val);
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_free0 (name_val);
-#line 1237 "PicasaPublishing.c"
+#line 1373 "PicasaPublishing.c"
 		}
 	}
 #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp39_ = _result_;
+	_tmp35_ = _result_;
 #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp39__length1 = _result__length1;
+	_tmp35__length1 = _result__length1;
 #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (result_length1) {
 #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		*result_length1 = _tmp39__length1;
-#line 1248 "PicasaPublishing.c"
+		*result_length1 = _tmp35__length1;
+#line 1384 "PicasaPublishing.c"
 	}
 #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	result = _tmp39_;
+	result = _tmp35_;
 #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 1254 "PicasaPublishing.c"
+#line 1390 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_picasa_publisher_load_parameters_from_configuration_system (PublishingPicasaPicasaPublisher* self, PublishingPicasaPublishingParameters* parameters) {
-	PublishingPicasaPublishingParameters* _tmp0_;
+static void
+publishing_picasa_picasa_publisher_load_parameters_from_configuration_system (PublishingPicasaPicasaPublisher* self,
+                                                                              PublishingPicasaPublishingParameters* parameters)
+{
+	SpitPublishingPluginHost* _tmp0_;
 	SpitPublishingPluginHost* _tmp1_;
-	gint _tmp2_;
-	PublishingPicasaPublishingParameters* _tmp3_;
-	SpitPublishingPluginHost* _tmp4_;
-	gboolean _tmp5_;
-	PublishingPicasaPublishingParameters* _tmp6_;
-	SpitPublishingPluginHost* _tmp7_;
-	gchar* _tmp8_;
-	gchar* _tmp9_;
+	SpitPublishingPluginHost* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
 #line 129 "/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"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (parameters));
 #line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = parameters;
-#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 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);
+	_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"
-	publishing_picasa_publishing_parameters_set_major_axis_size_selection_id (_tmp0_, _tmp2_);
+	publishing_picasa_publishing_parameters_set_major_axis_size_selection_id (parameters, spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default-size", 0));
 #line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp3_ = parameters;
-#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 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);
+	_tmp1_ = 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"
-	publishing_picasa_publishing_parameters_set_strip_metadata (_tmp3_, _tmp5_);
+	publishing_picasa_publishing_parameters_set_strip_metadata (parameters, spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip-metadata", FALSE));
 #line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp6_ = parameters;
+	_tmp2_ = 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"
-	_tmp7_ = 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"
-	_tmp8_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-album", NULL);
+	_tmp3_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-album", NULL);
 #line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp9_ = _tmp8_;
+	_tmp4_ = _tmp3_;
 #line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_picasa_publishing_parameters_set_target_album_name (_tmp6_, _tmp9_);
+	publishing_picasa_publishing_parameters_set_target_album_name (parameters, _tmp4_);
 #line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (_tmp9_);
-#line 1301 "PicasaPublishing.c"
+	_g_free0 (_tmp4_);
+#line 1425 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_picasa_publisher_save_parameters_to_configuration_system (PublishingPicasaPicasaPublisher* self, PublishingPicasaPublishingParameters* parameters) {
+static void
+publishing_picasa_picasa_publisher_save_parameters_to_configuration_system (PublishingPicasaPicasaPublisher* self,
+                                                                            PublishingPicasaPublishingParameters* parameters)
+{
 	SpitPublishingPluginHost* _tmp0_;
-	PublishingPicasaPublishingParameters* _tmp1_;
-	gint _tmp2_;
-	SpitPublishingPluginHost* _tmp3_;
-	PublishingPicasaPublishingParameters* _tmp4_;
-	gboolean _tmp5_;
-	SpitPublishingPluginHost* _tmp6_;
-	PublishingPicasaPublishingParameters* _tmp7_;
-	gchar* _tmp8_;
-	gchar* _tmp9_;
+	SpitPublishingPluginHost* _tmp1_;
+	SpitPublishingPluginHost* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
 #line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
 #line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1324,36 +1446,28 @@ static void publishing_picasa_picasa_publisher_save_parameters_to_configuration_
 #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 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp1_ = parameters;
-#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp2_ = publishing_picasa_publishing_parameters_get_major_axis_size_selection_id (_tmp1_);
-#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 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));
+	spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default-size", publishing_picasa_publishing_parameters_get_major_axis_size_selection_id (parameters));
 #line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp4_ = parameters;
-#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp5_ = publishing_picasa_publishing_parameters_get_strip_metadata (_tmp4_);
+	_tmp1_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
 #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 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));
+	spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", publishing_picasa_publishing_parameters_get_strip_metadata (parameters));
 #line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp7_ = parameters;
+	_tmp2_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
 #line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp8_ = publishing_picasa_publishing_parameters_get_target_album_name (_tmp7_);
+	_tmp3_ = publishing_picasa_publishing_parameters_get_target_album_name (parameters);
 #line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp9_ = _tmp8_;
+	_tmp4_ = _tmp3_;
 #line 138 "/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_);
+	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-album", _tmp4_);
 #line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (_tmp9_);
-#line 1348 "PicasaPublishing.c"
+	_g_free0 (_tmp4_);
+#line 1460 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_picasa_publisher_real_on_login_flow_complete (PublishingRESTSupportGooglePublisher* base) {
+static void
+publishing_picasa_picasa_publisher_real_on_login_flow_complete (PublishingRESTSupportGooglePublisher* base)
+{
 	PublishingPicasaPicasaPublisher * self;
 	PublishingPicasaPublishingParameters* _tmp0_;
 	PublishingRESTSupportGoogleSession* _tmp1_;
@@ -1382,351 +1496,307 @@ static void publishing_picasa_picasa_publisher_real_on_login_flow_complete (Publ
 	_publishing_rest_support_session_unref0 (_tmp2_);
 #line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_do_fetch_account_information (self);
-#line 1381 "PicasaPublishing.c"
+#line 1495 "PicasaPublishing.c"
 }
 
 
-static void _publishing_picasa_picasa_publisher_on_initial_album_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_picasa_picasa_publisher_on_initial_album_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                                   gpointer self)
+{
 #line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_on_initial_album_fetch_complete ((PublishingPicasaPicasaPublisher*) self, _sender);
-#line 1388 "PicasaPublishing.c"
+#line 1505 "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) {
+static void
+_publishing_picasa_picasa_publisher_on_initial_album_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                                    GError* err,
+                                                                                                                    gpointer self)
+{
 #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 1395 "PicasaPublishing.c"
+#line 1516 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_picasa_publisher_on_initial_album_fetch_complete (PublishingPicasaPicasaPublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_picasa_picasa_publisher_on_initial_album_fetch_complete (PublishingPicasaPicasaPublisher* self,
+                                                                    PublishingRESTSupportTransaction* txn)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	gboolean _tmp4_;
-	PublishingRESTSupportTransaction* _tmp5_;
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
 #line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = txn;
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
 #line 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);
+	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_initial_album_fetch_complete_publishing_rest_support_transaction_completed, self);
 #line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp2_ = txn;
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #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 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 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));
+	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_initial_album_fetch_error_publishing_rest_support_transaction_network_error, self);
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (!_tmp4_) {
+	if (!publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher))) {
 #line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 1428 "PicasaPublishing.c"
+#line 1542 "PicasaPublishing.c"
 	}
 #line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_debug ("PicasaPublishing.vala:157: EVENT: finished fetching account and album " \
 "information.");
 #line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp5_ = txn;
-#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 1436 "PicasaPublishing.c"
+	publishing_picasa_picasa_publisher_do_parse_and_display_account_information (self, G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_PICASA_TYPE_ALBUM_DIRECTORY_TRANSACTION, PublishingPicasaAlbumDirectoryTransaction));
+#line 1548 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_picasa_publisher_on_initial_album_fetch_error (PublishingPicasaPicasaPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_picasa_picasa_publisher_on_initial_album_fetch_error (PublishingPicasaPicasaPublisher* self,
+                                                                 PublishingRESTSupportTransaction* bad_txn,
+                                                                 GError* err)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	gboolean _tmp4_;
-	PublishingRESTSupportTransaction* _tmp5_;
-	gchar* _tmp6_;
-	gchar* _tmp7_;
-	gboolean _tmp8_ = FALSE;
-	PublishingRESTSupportTransaction* _tmp9_;
-	guint _tmp10_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gboolean _tmp4_ = FALSE;
 #line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
 #line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn));
 #line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = bad_txn;
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
 #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 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 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp2_ = bad_txn;
+	g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_initial_album_fetch_complete_publishing_rest_support_transaction_completed, self);
 #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);
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #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 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));
+	g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_initial_album_fetch_error_publishing_rest_support_transaction_network_error, self);
 #line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (!_tmp4_) {
+	if (!publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher))) {
 #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 1474 "PicasaPublishing.c"
+#line 1578 "PicasaPublishing.c"
 	}
 #line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp5_ = bad_txn;
+	_tmp2_ = publishing_rest_support_transaction_get_response (bad_txn);
 #line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp6_ = publishing_rest_support_transaction_get_response (_tmp5_);
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp7_ = _tmp6_;
+	_tmp3_ = _tmp2_;
 #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_);
+"on failed; response = '%s'.", _tmp3_);
 #line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (_tmp7_);
-#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp9_ = bad_txn;
-#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp10_ = publishing_rest_support_transaction_get_status_code (_tmp9_);
+	_g_free0 (_tmp3_);
 #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (_tmp10_ == ((guint) 403)) {
+	if (publishing_rest_support_transaction_get_status_code (bad_txn) == ((guint) 403)) {
 #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp8_ = TRUE;
-#line 1494 "PicasaPublishing.c"
+		_tmp4_ = TRUE;
+#line 1592 "PicasaPublishing.c"
 	} else {
-		PublishingRESTSupportTransaction* _tmp11_;
-		guint _tmp12_;
-#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp11_ = bad_txn;
 #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp12_ = publishing_rest_support_transaction_get_status_code (_tmp11_);
-#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp8_ = _tmp12_ == ((guint) 404);
-#line 1504 "PicasaPublishing.c"
+		_tmp4_ = publishing_rest_support_transaction_get_status_code (bad_txn) == ((guint) 404);
+#line 1596 "PicasaPublishing.c"
 	}
 #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (_tmp8_) {
+	if (_tmp4_) {
 #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 1510 "PicasaPublishing.c"
+#line 1602 "PicasaPublishing.c"
 	} else {
-		SpitPublishingPluginHost* _tmp13_;
-		GError* _tmp14_;
-#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));
+		SpitPublishingPluginHost* _tmp5_;
 #line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp14_ = err;
+		_tmp5_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
 #line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp13_, _tmp14_);
-#line 1520 "PicasaPublishing.c"
+		spit_publishing_plugin_host_post_error (_tmp5_, err);
+#line 1609 "PicasaPublishing.c"
 	}
 }
 
 
-static void publishing_picasa_picasa_publisher_on_publishing_options_logout (PublishingPicasaPicasaPublisher* self) {
-	gboolean _tmp0_;
+static void
+publishing_picasa_picasa_publisher_on_publishing_options_logout (PublishingPicasaPicasaPublisher* self)
+{
 #line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
 #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 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (!_tmp0_) {
+	if (!publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher))) {
 #line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 1535 "PicasaPublishing.c"
+#line 1623 "PicasaPublishing.c"
 	}
 #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 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 1541 "PicasaPublishing.c"
+#line 1629 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_picasa_publisher_on_publishing_options_publish (PublishingPicasaPicasaPublisher* self) {
-	gboolean _tmp0_;
-	PublishingPicasaPublishingParameters* _tmp1_;
+static void
+publishing_picasa_picasa_publisher_on_publishing_options_publish (PublishingPicasaPicasaPublisher* self)
+{
+	PublishingPicasaPublishingParameters* _tmp0_;
 #line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
 #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 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (!_tmp0_) {
+	if (!publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher))) {
 #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 1556 "PicasaPublishing.c"
+#line 1643 "PicasaPublishing.c"
 	}
 #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 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp1_ = self->priv->publishing_parameters;
+	_tmp0_ = self->priv->publishing_parameters;
 #line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_picasa_picasa_publisher_save_parameters_to_configuration_system (self, _tmp1_);
+	publishing_picasa_picasa_publisher_save_parameters_to_configuration_system (self, _tmp0_);
 #line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_do_upload (self);
-#line 1566 "PicasaPublishing.c"
+#line 1653 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_picasa_publisher_on_upload_status_updated (PublishingPicasaPicasaPublisher* self, gint file_number, gdouble completed_fraction) {
-	gboolean _tmp0_;
-	gdouble _tmp1_;
-	SpitPublishingProgressCallback _tmp2_;
-	void* _tmp2__target;
-	SpitPublishingProgressCallback _tmp3_;
-	void* _tmp3__target;
-	gint _tmp4_;
-	gdouble _tmp5_;
+static void
+publishing_picasa_picasa_publisher_on_upload_status_updated (PublishingPicasaPicasaPublisher* self,
+                                                             gint file_number,
+                                                             gdouble completed_fraction)
+{
+	SpitPublishingProgressCallback _tmp0_;
+	void* _tmp0__target;
+	SpitPublishingProgressCallback _tmp1_;
+	void* _tmp1__target;
 #line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
 #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 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (!_tmp0_) {
+	if (!publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher))) {
 #line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 1587 "PicasaPublishing.c"
+#line 1672 "PicasaPublishing.c"
 	}
 #line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp1_ = completed_fraction;
-#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_);
+" complete.", 100.0 * completed_fraction);
 #line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp2_ = self->priv->progress_reporter;
+	_tmp0_ = self->priv->progress_reporter;
 #line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp2__target = self->priv->progress_reporter_target;
+	_tmp0__target = self->priv->progress_reporter_target;
 #line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_vala_assert (_tmp2_ != NULL, "progress_reporter != null");
-#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp3_ = self->priv->progress_reporter;
-#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp3__target = self->priv->progress_reporter_target;
+	_vala_assert (_tmp0_ != NULL, "progress_reporter != null");
 #line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp4_ = file_number;
+	_tmp1_ = self->priv->progress_reporter;
 #line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp5_ = completed_fraction;
+	_tmp1__target = self->priv->progress_reporter_target;
 #line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 1609 "PicasaPublishing.c"
+	_tmp1_ (file_number, completed_fraction, _tmp1__target);
+#line 1688 "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) {
+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 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_on_upload_complete ((PublishingPicasaPicasaPublisher*) self, _sender, num_photos_published);
-#line 1616 "PicasaPublishing.c"
+#line 1699 "PicasaPublishing.c"
 }
 
 
-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_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender,
+                                                                                                         GError* err,
+                                                                                                         gpointer self)
+{
 #line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_on_upload_error ((PublishingPicasaPicasaPublisher*) self, _sender, err);
-#line 1623 "PicasaPublishing.c"
+#line 1710 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_picasa_publisher_on_upload_complete (PublishingPicasaPicasaPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published) {
-	gboolean _tmp0_;
-	gint _tmp1_;
-	PublishingRESTSupportBatchUploader* _tmp2_;
-	guint _tmp3_;
-	PublishingRESTSupportBatchUploader* _tmp4_;
-	guint _tmp5_;
+static void
+publishing_picasa_picasa_publisher_on_upload_complete (PublishingPicasaPicasaPublisher* self,
+                                                       PublishingRESTSupportBatchUploader* uploader,
+                                                       gint num_published)
+{
+	guint _tmp0_;
+	guint _tmp1_;
 #line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
 #line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
 #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 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (!_tmp0_) {
+	if (!publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher))) {
 #line 215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 1644 "PicasaPublishing.c"
+#line 1729 "PicasaPublishing.c"
 	}
 #line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp1_ = num_published;
-#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 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp2_ = uploader;
+" items published.", num_published);
 #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);
+	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp0_, NULL, FALSE);
 #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);
+	g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
 #line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp4_ = uploader;
+	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
 #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 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);
+	g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
 #line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_do_show_success_pane (self);
-#line 1664 "PicasaPublishing.c"
+#line 1743 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_picasa_publisher_on_upload_error (PublishingPicasaPicasaPublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err) {
-	gboolean _tmp0_;
-	GError* _tmp1_;
-	const gchar* _tmp2_;
-	PublishingRESTSupportBatchUploader* _tmp3_;
-	guint _tmp4_;
-	PublishingRESTSupportBatchUploader* _tmp5_;
-	guint _tmp6_;
-	SpitPublishingPluginHost* _tmp7_;
-	GError* _tmp8_;
+static void
+publishing_picasa_picasa_publisher_on_upload_error (PublishingPicasaPicasaPublisher* self,
+                                                    PublishingRESTSupportBatchUploader* uploader,
+                                                    GError* err)
+{
+	const gchar* _tmp0_;
+	guint _tmp1_;
+	guint _tmp2_;
+	SpitPublishingPluginHost* _tmp3_;
 #line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
 #line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
 #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 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (!_tmp0_) {
+	if (!publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher))) {
 #line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 1688 "PicasaPublishing.c"
+#line 1764 "PicasaPublishing.c"
 	}
 #line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp1_ = err;
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp2_ = _tmp1_->message;
+	_tmp0_ = err->message;
 #line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_debug ("PicasaPublishing.vala:230: EVENT: uploader reports upload error = '%s'" \
-".", _tmp2_);
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp3_ = uploader;
+".", _tmp0_);
 #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);
+	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
 #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);
+	g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
 #line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp5_ = uploader;
+	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp2_, NULL, FALSE);
 #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 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 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));
+	g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
 #line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp8_ = err;
+	_tmp3_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
 #line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 1714 "PicasaPublishing.c"
+	spit_publishing_plugin_host_post_error (_tmp3_, err);
+#line 1782 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_picasa_publisher_do_fetch_account_information (PublishingPicasaPicasaPublisher* self) {
+static void
+publishing_picasa_picasa_publisher_do_fetch_account_information (PublishingPicasaPicasaPublisher* self)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	SpitPublishingPluginHost* _tmp1_;
 	PublishingPicasaAlbumDirectoryTransaction* directory_trans = NULL;
@@ -1764,7 +1834,7 @@ static void publishing_picasa_picasa_publisher_do_fetch_account_information (Pub
 	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 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 1755 "PicasaPublishing.c"
+#line 1825 "PicasaPublishing.c"
 	{
 #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_);
@@ -1772,7 +1842,7 @@ static void publishing_picasa_picasa_publisher_do_fetch_account_information (Pub
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 1763 "PicasaPublishing.c"
+#line 1833 "PicasaPublishing.c"
 				goto __catch6_spit_publishing_publishing_error;
 			}
 #line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1783,7 +1853,7 @@ static void publishing_picasa_picasa_publisher_do_fetch_account_information (Pub
 			g_clear_error (&_inner_error_);
 #line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return;
-#line 1774 "PicasaPublishing.c"
+#line 1844 "PicasaPublishing.c"
 		}
 	}
 	goto __finally6;
@@ -1801,7 +1871,7 @@ static void publishing_picasa_picasa_publisher_do_fetch_account_information (Pub
 		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 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_error_free0 (err);
-#line 1792 "PicasaPublishing.c"
+#line 1862 "PicasaPublishing.c"
 	}
 	__finally6:
 #line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1814,24 +1884,30 @@ static void publishing_picasa_picasa_publisher_do_fetch_account_information (Pub
 		g_clear_error (&_inner_error_);
 #line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 1805 "PicasaPublishing.c"
+#line 1875 "PicasaPublishing.c"
 	}
 #line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (directory_trans);
-#line 1809 "PicasaPublishing.c"
+#line 1879 "PicasaPublishing.c"
 }
 
 
-static gchar* _publishing_picasa_album_directory_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self) {
+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"
+#line 1891 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_picasa_publisher_do_parse_and_display_account_information (PublishingPicasaPicasaPublisher* self, PublishingPicasaAlbumDirectoryTransaction* transaction) {
+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 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1841,34 +1917,31 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info
 #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 1831 "PicasaPublishing.c"
+#line 1907 "PicasaPublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* _tmp0_ = NULL;
-		PublishingPicasaAlbumDirectoryTransaction* _tmp1_;
+		gchar* _tmp1_;
 		gchar* _tmp2_;
-		gchar* _tmp3_;
+		PublishingRESTSupportXmlDocument* _tmp3_;
 		PublishingRESTSupportXmlDocument* _tmp4_;
 		PublishingRESTSupportXmlDocument* _tmp5_;
-		PublishingRESTSupportXmlDocument* _tmp6_;
 #line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp1_ = transaction;
+		_tmp1_ = publishing_rest_support_transaction_get_response (G_TYPE_CHECK_INSTANCE_CAST (transaction, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
 #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 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp3_ = _tmp2_;
+		_tmp2_ = _tmp1_;
 #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_);
+		_tmp3_ = publishing_rest_support_xml_document_parse_string (_tmp2_, _publishing_picasa_album_directory_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
 #line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp5_ = _tmp4_;
+		_tmp4_ = _tmp3_;
 #line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_g_free0 (_tmp3_);
+		_g_free0 (_tmp2_);
 #line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp0_ = _tmp5_;
+		_tmp0_ = _tmp4_;
 #line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 1858 "PicasaPublishing.c"
+#line 1931 "PicasaPublishing.c"
 				goto __catch7_spit_publishing_publishing_error;
 			}
 #line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1879,43 +1952,43 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info
 			g_clear_error (&_inner_error_);
 #line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return;
-#line 1869 "PicasaPublishing.c"
+#line 1942 "PicasaPublishing.c"
 		}
 #line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp6_ = _tmp0_;
+		_tmp5_ = _tmp0_;
 #line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp0_ = NULL;
 #line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (response_doc);
 #line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		response_doc = _tmp6_;
+		response_doc = _tmp5_;
 #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (_tmp0_);
-#line 1881 "PicasaPublishing.c"
+#line 1954 "PicasaPublishing.c"
 	}
 	goto __finally7;
 	__catch7_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp7_;
-		GError* _tmp8_;
+		SpitPublishingPluginHost* _tmp6_;
+		GError* _tmp7_;
 #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		err = _inner_error_;
 #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_inner_error_ = NULL;
 #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));
+		_tmp6_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
 #line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp8_ = err;
+		_tmp7_ = err;
 #line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
+		spit_publishing_plugin_host_post_error (_tmp6_, _tmp7_);
 #line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_error_free0 (err);
 #line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (response_doc);
 #line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 1905 "PicasaPublishing.c"
+#line 1978 "PicasaPublishing.c"
 	}
 	__finally7:
 #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1928,34 +2001,34 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info
 		g_clear_error (&_inner_error_);
 #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 1918 "PicasaPublishing.c"
+#line 1991 "PicasaPublishing.c"
 	}
 	{
-		PublishingPicasaAlbum** _tmp9_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp10_;
-		xmlNode* _tmp11_;
-		gint _tmp12_;
-		PublishingPicasaAlbum** _tmp13_;
-		gint _tmp9__length1;
-		gint __tmp9__size_;
-		PublishingPicasaPublishingParameters* _tmp14_;
+		PublishingPicasaAlbum** _tmp8_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp9_;
+		xmlNode* _tmp10_;
+		gint _tmp11_;
+		PublishingPicasaAlbum** _tmp12_;
+		gint _tmp8__length1;
+		gint __tmp8__size_;
+		PublishingPicasaPublishingParameters* _tmp13_;
 #line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp10_ = response_doc;
+		_tmp9_ = response_doc;
 #line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp11_ = publishing_rest_support_xml_document_get_root_node (_tmp10_);
+		_tmp10_ = publishing_rest_support_xml_document_get_root_node (_tmp9_);
 #line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp13_ = publishing_picasa_picasa_publisher_extract_albums_helper (self, _tmp11_, &_tmp12_, &_inner_error_);
+		_tmp12_ = publishing_picasa_picasa_publisher_extract_albums_helper (self, _tmp10_, &_tmp11_, &_inner_error_);
 #line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp9_ = _tmp13_;
+		_tmp8_ = _tmp12_;
 #line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp9__length1 = _tmp12_;
+		_tmp8__length1 = _tmp11_;
 #line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		__tmp9__size_ = _tmp9__length1;
+		__tmp8__size_ = _tmp8__length1;
 #line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 1945 "PicasaPublishing.c"
+#line 2018 "PicasaPublishing.c"
 				goto __catch8_spit_publishing_publishing_error;
 			}
 #line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1966,39 +2039,39 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info
 			g_clear_error (&_inner_error_);
 #line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return;
-#line 1956 "PicasaPublishing.c"
+#line 2029 "PicasaPublishing.c"
 		}
 #line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp14_ = self->priv->publishing_parameters;
+		_tmp13_ = self->priv->publishing_parameters;
 #line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		publishing_picasa_publishing_parameters_set_albums (_tmp14_, _tmp9_, _tmp9__length1);
+		publishing_picasa_publishing_parameters_set_albums (_tmp13_, _tmp8_, _tmp8__length1);
 #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 1964 "PicasaPublishing.c"
+		_tmp8_ = (_vala_array_free (_tmp8_, _tmp8__length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
+#line 2037 "PicasaPublishing.c"
 	}
 	goto __finally8;
 	__catch8_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp15_;
-		GError* _tmp16_;
+		SpitPublishingPluginHost* _tmp14_;
+		GError* _tmp15_;
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		err = _inner_error_;
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_inner_error_ = NULL;
 #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));
+		_tmp14_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
 #line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp16_ = err;
+		_tmp15_ = err;
 #line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp15_, _tmp16_);
+		spit_publishing_plugin_host_post_error (_tmp14_, _tmp15_);
 #line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_error_free0 (err);
 #line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (response_doc);
 #line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 1988 "PicasaPublishing.c"
+#line 2061 "PicasaPublishing.c"
 	}
 	__finally8:
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2011,44 +2084,51 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info
 		g_clear_error (&_inner_error_);
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2001 "PicasaPublishing.c"
+#line 2074 "PicasaPublishing.c"
 	}
 #line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_do_show_publishing_options_pane (self);
 #line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 2007 "PicasaPublishing.c"
+#line 2080 "PicasaPublishing.c"
 }
 
 
-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_publish_publishing_picasa_publishing_options_pane_publish (PublishingPicasaPublishingOptionsPane* _sender,
+                                                                                                                     gpointer self)
+{
 #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_on_publishing_options_publish ((PublishingPicasaPicasaPublisher*) self);
-#line 2014 "PicasaPublishing.c"
+#line 2090 "PicasaPublishing.c"
 }
 
 
-static void _publishing_picasa_picasa_publisher_on_publishing_options_logout_publishing_picasa_publishing_options_pane_logout (PublishingPicasaPublishingOptionsPane* _sender, gpointer self) {
+static void
+_publishing_picasa_picasa_publisher_on_publishing_options_logout_publishing_picasa_publishing_options_pane_logout (PublishingPicasaPublishingOptionsPane* _sender,
+                                                                                                                   gpointer self)
+{
 #line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_on_publishing_options_logout ((PublishingPicasaPicasaPublisher*) self);
-#line 2021 "PicasaPublishing.c"
+#line 2100 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane (PublishingPicasaPicasaPublisher* self) {
+static void
+publishing_picasa_picasa_publisher_do_show_publishing_options_pane (PublishingPicasaPicasaPublisher* self)
+{
 	GtkBuilder* builder = NULL;
 	GtkBuilder* _tmp0_;
 	PublishingPicasaPublishingOptionsPane* opts_pane = NULL;
 	GtkBuilder* _tmp7_;
 	PublishingPicasaPublishingParameters* _tmp8_;
 	SpitPublishingAuthenticator* _tmp9_;
-	gboolean _tmp10_;
+	PublishingPicasaPublishingOptionsPane* _tmp10_;
 	PublishingPicasaPublishingOptionsPane* _tmp11_;
 	PublishingPicasaPublishingOptionsPane* _tmp12_;
-	PublishingPicasaPublishingOptionsPane* _tmp13_;
-	SpitPublishingPluginHost* _tmp14_;
-	PublishingPicasaPublishingOptionsPane* _tmp15_;
-	SpitPublishingPluginHost* _tmp16_;
+	SpitPublishingPluginHost* _tmp13_;
+	PublishingPicasaPublishingOptionsPane* _tmp14_;
+	SpitPublishingPluginHost* _tmp15_;
 	GError * _inner_error_ = NULL;
 #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
@@ -2058,7 +2138,7 @@ static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane (
 	_tmp0_ = gtk_builder_new ();
 #line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	builder = _tmp0_;
-#line 2048 "PicasaPublishing.c"
+#line 2128 "PicasaPublishing.c"
 	{
 		GtkBuilder* _tmp1_;
 #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2067,7 +2147,7 @@ static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane (
 		gtk_builder_add_from_resource (_tmp1_, PLUGIN_RESOURCE_PATH "/" "picasa_publishing_options_pane.ui", &_inner_error_);
 #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2057 "PicasaPublishing.c"
+#line 2137 "PicasaPublishing.c"
 			goto __catch9_g_error;
 		}
 	}
@@ -2107,7 +2187,7 @@ static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane (
 		_g_object_unref0 (builder);
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2096 "PicasaPublishing.c"
+#line 2176 "PicasaPublishing.c"
 	}
 	__finally9:
 #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2120,7 +2200,7 @@ static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane (
 		g_clear_error (&_inner_error_);
 #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2109 "PicasaPublishing.c"
+#line 2189 "PicasaPublishing.c"
 	}
 #line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp7_ = builder;
@@ -2129,72 +2209,73 @@ static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane (
 #line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp9_ = self->priv->authenticator;
 #line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp10_ = spit_publishing_authenticator_can_logout (_tmp9_);
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp11_ = publishing_picasa_publishing_options_pane_new (_tmp7_, _tmp8_, _tmp10_);
+	_tmp10_ = publishing_picasa_publishing_options_pane_new (_tmp7_, _tmp8_, spit_publishing_authenticator_can_logout (_tmp9_));
 #line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	opts_pane = _tmp11_;
+	opts_pane = _tmp10_;
 #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp12_ = opts_pane;
+	_tmp11_ = opts_pane;
 #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_connect_object (_tmp12_, "publish", (GCallback) _publishing_picasa_picasa_publisher_on_publishing_options_publish_publishing_picasa_publishing_options_pane_publish, self, 0);
+	g_signal_connect_object (_tmp11_, "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"
-	_tmp13_ = opts_pane;
+	_tmp12_ = opts_pane;
 #line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_connect_object (_tmp13_, "logout", (GCallback) _publishing_picasa_picasa_publisher_on_publishing_options_logout_publishing_picasa_publishing_options_pane_logout, self, 0);
+	g_signal_connect_object (_tmp12_, "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"
-	_tmp14_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+	_tmp13_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp15_ = opts_pane;
+	_tmp14_ = opts_pane;
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.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);
+	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 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp16_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+	_tmp15_ = 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 (_tmp16_, FALSE);
+	spit_publishing_plugin_host_set_service_locked (_tmp15_, FALSE);
 #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (opts_pane);
 #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (builder);
-#line 2145 "PicasaPublishing.c"
+#line 2223 "PicasaPublishing.c"
 }
 
 
-static void _publishing_picasa_picasa_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
+static void
+_publishing_picasa_picasa_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number,
+                                                                                                gdouble fraction_complete,
+                                                                                                gpointer self)
+{
 #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 2152 "PicasaPublishing.c"
+#line 2234 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_picasa_publisher_do_upload (PublishingPicasaPicasaPublisher* self) {
+static void
+publishing_picasa_picasa_publisher_do_upload (PublishingPicasaPicasaPublisher* self)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	SpitPublishingPluginHost* _tmp1_;
 	PublishingPicasaPublishingParameters* _tmp2_;
-	gint _tmp3_;
-	PublishingPicasaPublishingParameters* _tmp4_;
-	gboolean _tmp5_;
-	void* _tmp6_;
-	GDestroyNotify _tmp7_;
-	SpitPublishingProgressCallback _tmp8_;
-	gboolean _tmp9_;
+	PublishingPicasaPublishingParameters* _tmp3_;
+	void* _tmp4_;
+	GDestroyNotify _tmp5_;
+	SpitPublishingProgressCallback _tmp6_;
 	SpitPublishingPublishable** publishables = NULL;
-	SpitPublishingPluginHost* _tmp10_;
-	gint _tmp11_;
-	SpitPublishingPublishable** _tmp12_;
+	SpitPublishingPluginHost* _tmp7_;
+	gint _tmp8_;
+	SpitPublishingPublishable** _tmp9_;
 	gint publishables_length1;
 	gint _publishables_size_;
 	PublishingPicasaUploader* uploader = NULL;
-	PublishingRESTSupportGoogleSession* _tmp13_;
-	PublishingRESTSupportGoogleSession* _tmp14_;
-	SpitPublishingPublishable** _tmp15_;
-	gint _tmp15__length1;
-	PublishingPicasaPublishingParameters* _tmp16_;
+	PublishingRESTSupportGoogleSession* _tmp10_;
+	PublishingRESTSupportGoogleSession* _tmp11_;
+	SpitPublishingPublishable** _tmp12_;
+	gint _tmp12__length1;
+	PublishingPicasaPublishingParameters* _tmp13_;
+	PublishingPicasaUploader* _tmp14_;
+	PublishingPicasaUploader* _tmp15_;
+	PublishingPicasaUploader* _tmp16_;
 	PublishingPicasaUploader* _tmp17_;
 	PublishingPicasaUploader* _tmp18_;
-	PublishingPicasaUploader* _tmp19_;
-	PublishingPicasaUploader* _tmp20_;
-	PublishingPicasaUploader* _tmp21_;
 #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
 #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2209,13 +2290,9 @@ static void publishing_picasa_picasa_publisher_do_upload (PublishingPicasaPicasa
 #line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = self->priv->publishing_parameters;
 #line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp3_ = publishing_picasa_publishing_parameters_get_major_axis_size_pixels (_tmp2_);
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp4_ = self->priv->publishing_parameters;
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp5_ = publishing_picasa_publishing_parameters_get_strip_metadata (_tmp4_);
+	_tmp3_ = self->priv->publishing_parameters;
 #line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp8_ = spit_publishing_plugin_host_serialize_publishables (_tmp1_, _tmp3_, _tmp5_, &_tmp6_, &_tmp7_);
+	_tmp6_ = spit_publishing_plugin_host_serialize_publishables (_tmp1_, publishing_picasa_publishing_parameters_get_major_axis_size_pixels (_tmp2_), publishing_picasa_publishing_parameters_get_strip_metadata (_tmp3_), &_tmp4_, &_tmp5_);
 #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 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2225,68 +2302,68 @@ static void publishing_picasa_picasa_publisher_do_upload (PublishingPicasaPicasa
 #line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = NULL;
 #line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->progress_reporter = _tmp8_;
+	self->priv->progress_reporter = _tmp6_;
 #line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->progress_reporter_target = _tmp6_;
+	self->priv->progress_reporter_target = _tmp4_;
 #line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->progress_reporter_target_destroy_notify = _tmp7_;
+	self->priv->progress_reporter_target_destroy_notify = _tmp5_;
 #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 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (!_tmp9_) {
+	if (!publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher))) {
 #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2224 "PicasaPublishing.c"
+#line 2299 "PicasaPublishing.c"
 	}
 #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));
+	_tmp7_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
 #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp12_ = spit_publishing_plugin_host_get_publishables (_tmp10_, &_tmp11_);
+	_tmp9_ = spit_publishing_plugin_host_get_publishables (_tmp7_, &_tmp8_);
 #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishables = _tmp12_;
+	publishables = _tmp9_;
 #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishables_length1 = _tmp11_;
+	publishables_length1 = _tmp8_;
 #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishables_size_ = publishables_length1;
 #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));
+	_tmp10_ = publishing_rest_support_google_publisher_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
 #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp14_ = _tmp13_;
+	_tmp11_ = _tmp10_;
 #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp15_ = publishables;
+	_tmp12_ = publishables;
 #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp15__length1 = publishables_length1;
+	_tmp12__length1 = publishables_length1;
 #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp16_ = self->priv->publishing_parameters;
+	_tmp13_ = self->priv->publishing_parameters;
 #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp17_ = publishing_picasa_uploader_new (_tmp14_, _tmp15_, _tmp15__length1, _tmp16_);
+	_tmp14_ = publishing_picasa_uploader_new (_tmp11_, _tmp12_, _tmp12__length1, _tmp13_);
 #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp18_ = _tmp17_;
+	_tmp15_ = _tmp14_;
 #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_publishing_rest_support_session_unref0 (_tmp14_);
+	_publishing_rest_support_session_unref0 (_tmp11_);
 #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	uploader = _tmp18_;
+	uploader = _tmp15_;
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp19_ = uploader;
+	_tmp16_ = uploader;
 #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);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, 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 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp20_ = uploader;
+	_tmp17_ = uploader;
 #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);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, 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 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp21_ = uploader;
+	_tmp18_ = uploader;
 #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);
+	publishing_rest_support_batch_uploader_upload (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), _publishing_picasa_picasa_publisher_on_upload_status_updated_spit_publishing_progress_callback, self);
 #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_rest_support_batch_uploader_unref0 (uploader);
 #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 2270 "PicasaPublishing.c"
+#line 2345 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_picasa_publisher_do_show_success_pane (PublishingPicasaPicasaPublisher* self) {
+static void
+publishing_picasa_picasa_publisher_do_show_success_pane (PublishingPicasaPicasaPublisher* self)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	SpitPublishingPluginHost* _tmp1_;
 #line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2301,16 +2378,17 @@ static void publishing_picasa_picasa_publisher_do_show_success_pane (PublishingP
 	_tmp1_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
 #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	spit_publishing_plugin_host_install_success_pane (_tmp1_);
-#line 2289 "PicasaPublishing.c"
+#line 2366 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_picasa_publisher_real_do_logout (PublishingRESTSupportGooglePublisher* base) {
+static void
+publishing_picasa_picasa_publisher_real_do_logout (PublishingRESTSupportGooglePublisher* base)
+{
 	PublishingPicasaPicasaPublisher * self;
 	PublishingRESTSupportGoogleSession* _tmp0_;
 	PublishingRESTSupportGoogleSession* _tmp1_;
 	SpitPublishingAuthenticator* _tmp2_;
-	gboolean _tmp3_;
 #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 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2326,26 +2404,26 @@ static void publishing_picasa_picasa_publisher_real_do_logout (PublishingRESTSup
 #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 2317 "PicasaPublishing.c"
+	if (spit_publishing_authenticator_can_logout (_tmp2_)) {
+#line 2393 "PicasaPublishing.c"
+		SpitPublishingAuthenticator* _tmp3_;
 		SpitPublishingAuthenticator* _tmp4_;
-		SpitPublishingAuthenticator* _tmp5_;
 #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp4_ = self->priv->authenticator;
+		_tmp3_ = self->priv->authenticator;
 #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		spit_publishing_authenticator_logout (_tmp4_);
+		spit_publishing_authenticator_logout (_tmp3_);
 #line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp5_ = self->priv->authenticator;
+		_tmp4_ = self->priv->authenticator;
 #line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		spit_publishing_authenticator_authenticate (_tmp5_);
-#line 2328 "PicasaPublishing.c"
+		spit_publishing_authenticator_authenticate (_tmp4_);
+#line 2404 "PicasaPublishing.c"
 	}
 }
 
 
-static gboolean publishing_picasa_picasa_publisher_real_is_running (PublishingRESTSupportGooglePublisher* base) {
+static gboolean
+publishing_picasa_picasa_publisher_real_is_running (PublishingRESTSupportGooglePublisher* base)
+{
 	PublishingPicasaPicasaPublisher * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_;
@@ -2357,37 +2435,38 @@ static gboolean publishing_picasa_picasa_publisher_real_is_running (PublishingRE
 	result = _tmp0_;
 #line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 2345 "PicasaPublishing.c"
+#line 2423 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_picasa_publisher_real_start (PublishingRESTSupportGooglePublisher* base) {
+static void
+publishing_picasa_picasa_publisher_real_start (PublishingRESTSupportGooglePublisher* base)
+{
 	PublishingPicasaPicasaPublisher * self;
-	gboolean _tmp0_;
-	SpitPublishingAuthenticator* _tmp1_;
+	SpitPublishingAuthenticator* _tmp0_;
 #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 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 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (_tmp0_) {
+	if (publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher))) {
 #line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2363 "PicasaPublishing.c"
+#line 2440 "PicasaPublishing.c"
 	}
 #line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->running = TRUE;
 #line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp1_ = self->priv->authenticator;
+	_tmp0_ = self->priv->authenticator;
 #line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	spit_publishing_authenticator_authenticate (_tmp1_);
-#line 2371 "PicasaPublishing.c"
+	spit_publishing_authenticator_authenticate (_tmp0_);
+#line 2448 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_picasa_publisher_real_stop (PublishingRESTSupportGooglePublisher* base) {
+static void
+publishing_picasa_picasa_publisher_real_stop (PublishingRESTSupportGooglePublisher* base)
+{
 	PublishingPicasaPicasaPublisher * self;
 	PublishingRESTSupportGoogleSession* _tmp0_;
 	PublishingRESTSupportGoogleSession* _tmp1_;
@@ -2405,11 +2484,13 @@ static void publishing_picasa_picasa_publisher_real_stop (PublishingRESTSupportG
 	_publishing_rest_support_session_unref0 (_tmp1_);
 #line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->running = FALSE;
-#line 2393 "PicasaPublishing.c"
+#line 2472 "PicasaPublishing.c"
 }
 
 
-static SpitPublishingAuthenticator* publishing_picasa_picasa_publisher_real_get_authenticator (PublishingRESTSupportGooglePublisher* base) {
+static SpitPublishingAuthenticator*
+publishing_picasa_picasa_publisher_real_get_authenticator (PublishingRESTSupportGooglePublisher* base)
+{
 	PublishingPicasaPicasaPublisher * self;
 	SpitPublishingAuthenticator* result = NULL;
 	SpitPublishingAuthenticator* _tmp0_;
@@ -2421,7 +2502,7 @@ static SpitPublishingAuthenticator* publishing_picasa_picasa_publisher_real_get_
 	_tmp0_ = self->priv->authenticator;
 #line 369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 2409 "PicasaPublishing.c"
+#line 2490 "PicasaPublishing.c"
 		PublishingAuthenticatorFactory* _tmp1_;
 		PublishingAuthenticatorFactory* _tmp2_;
 		SpitPublishingPluginHost* _tmp3_;
@@ -2440,7 +2521,7 @@ static SpitPublishingAuthenticator* publishing_picasa_picasa_publisher_real_get_
 		self->priv->authenticator = _tmp4_;
 #line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_object_unref0 (_tmp2_);
-#line 2428 "PicasaPublishing.c"
+#line 2509 "PicasaPublishing.c"
 	}
 #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp5_ = self->priv->authenticator;
@@ -2450,11 +2531,13 @@ static SpitPublishingAuthenticator* publishing_picasa_picasa_publisher_real_get_
 	result = _tmp6_;
 #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 2438 "PicasaPublishing.c"
+#line 2519 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_picasa_publisher_class_init (PublishingPicasaPicasaPublisherClass * klass) {
+static void
+publishing_picasa_picasa_publisher_class_init (PublishingPicasaPicasaPublisherClass * klass)
+{
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_parent_class = g_type_class_peek_parent (klass);
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2473,18 +2556,22 @@ static void publishing_picasa_picasa_publisher_class_init (PublishingPicasaPicas
 	((PublishingRESTSupportGooglePublisherClass *) klass)->get_authenticator = (SpitPublishingAuthenticator* (*) (PublishingRESTSupportGooglePublisher *)) 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 2461 "PicasaPublishing.c"
+#line 2544 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_picasa_publisher_instance_init (PublishingPicasaPicasaPublisher * self) {
+static void
+publishing_picasa_picasa_publisher_instance_init (PublishingPicasaPicasaPublisher * self)
+{
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv = PUBLISHING_PICASA_PICASA_PUBLISHER_GET_PRIVATE (self);
-#line 2468 "PicasaPublishing.c"
+#line 2553 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_picasa_publisher_finalize (GObject * obj) {
+static void
+publishing_picasa_picasa_publisher_finalize (GObject * obj)
+{
 	PublishingPicasaPicasaPublisher * self;
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, PublishingPicasaPicasaPublisher);
@@ -2502,11 +2589,13 @@ static void publishing_picasa_picasa_publisher_finalize (GObject * obj) {
 	_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 2490 "PicasaPublishing.c"
+#line 2577 "PicasaPublishing.c"
 }
 
 
-GType publishing_picasa_picasa_publisher_get_type (void) {
+GType
+publishing_picasa_picasa_publisher_get_type (void)
+{
 	static volatile gsize publishing_picasa_picasa_publisher_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_picasa_picasa_publisher_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingPicasaPicasaPublisherClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_picasa_picasa_publisher_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPicasaPicasaPublisher), 0, (GInstanceInitFunc) publishing_picasa_picasa_publisher_instance_init, NULL };
@@ -2518,12 +2607,14 @@ GType publishing_picasa_picasa_publisher_get_type (void) {
 }
 
 
-PublishingPicasaAlbum* publishing_picasa_album_construct (GType object_type, const gchar* name, const gchar* url) {
+PublishingPicasaAlbum*
+publishing_picasa_album_construct (GType object_type,
+                                   const gchar* name,
+                                   const gchar* url)
+{
 	PublishingPicasaAlbum* self = NULL;
-	const gchar* _tmp0_;
+	gchar* _tmp0_;
 	gchar* _tmp1_;
-	const gchar* _tmp2_;
-	gchar* _tmp3_;
 #line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2531,132 +2622,156 @@ PublishingPicasaAlbum* publishing_picasa_album_construct (GType object_type, con
 #line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = (PublishingPicasaAlbum*) g_type_create_instance (object_type);
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = name;
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (name);
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->name);
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->name = _tmp1_;
+	self->name = _tmp0_;
 #line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp2_ = url;
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp3_ = g_strdup (_tmp2_);
+	_tmp1_ = g_strdup (url);
 #line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->url);
 #line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->url = _tmp3_;
+	self->url = _tmp1_;
 #line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 2536 "PicasaPublishing.c"
+#line 2623 "PicasaPublishing.c"
 }
 
 
-PublishingPicasaAlbum* publishing_picasa_album_new (const gchar* name, const gchar* url) {
+PublishingPicasaAlbum*
+publishing_picasa_album_new (const gchar* name,
+                             const gchar* url)
+{
 #line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return publishing_picasa_album_construct (PUBLISHING_PICASA_TYPE_ALBUM, name, url);
-#line 2543 "PicasaPublishing.c"
+#line 2633 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_value_album_init (GValue* value) {
+static void
+publishing_picasa_value_album_init (GValue* value)
+{
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 2550 "PicasaPublishing.c"
+#line 2642 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_value_album_free_value (GValue* value) {
+static void
+publishing_picasa_value_album_free_value (GValue* value)
+{
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (value->data[0].v_pointer) {
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_album_unref (value->data[0].v_pointer);
-#line 2559 "PicasaPublishing.c"
+#line 2653 "PicasaPublishing.c"
 	}
 }
 
 
-static void publishing_picasa_value_album_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_picasa_value_album_copy_value (const GValue* src_value,
+                                          GValue* dest_value)
+{
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (src_value->data[0].v_pointer) {
 #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 2569 "PicasaPublishing.c"
+#line 2666 "PicasaPublishing.c"
 	} else {
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2573 "PicasaPublishing.c"
+#line 2670 "PicasaPublishing.c"
 	}
 }
 
 
-static gpointer publishing_picasa_value_album_peek_pointer (const GValue* value) {
+static gpointer
+publishing_picasa_value_album_peek_pointer (const GValue* value)
+{
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return value->data[0].v_pointer;
-#line 2581 "PicasaPublishing.c"
+#line 2680 "PicasaPublishing.c"
 }
 
 
-static gchar* publishing_picasa_value_album_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_picasa_value_album_collect_value (GValue* value,
+                                             guint n_collect_values,
+                                             GTypeCValue* collect_values,
+                                             guint collect_flags)
+{
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 2588 "PicasaPublishing.c"
+#line 2692 "PicasaPublishing.c"
 		PublishingPicasaAlbum * object;
 		object = collect_values[0].v_pointer;
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #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 2595 "PicasaPublishing.c"
+#line 2699 "PicasaPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #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 2599 "PicasaPublishing.c"
+#line 2703 "PicasaPublishing.c"
 		}
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = publishing_picasa_album_ref (object);
-#line 2603 "PicasaPublishing.c"
+#line 2707 "PicasaPublishing.c"
 	} else {
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 2607 "PicasaPublishing.c"
+#line 2711 "PicasaPublishing.c"
 	}
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return NULL;
-#line 2611 "PicasaPublishing.c"
+#line 2715 "PicasaPublishing.c"
 }
 
 
-static gchar* publishing_picasa_value_album_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+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 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!object_p) {
 #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 2622 "PicasaPublishing.c"
+#line 2731 "PicasaPublishing.c"
 	}
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = NULL;
-#line 2628 "PicasaPublishing.c"
+#line 2737 "PicasaPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2632 "PicasaPublishing.c"
+#line 2741 "PicasaPublishing.c"
 	} else {
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = publishing_picasa_album_ref (value->data[0].v_pointer);
-#line 2636 "PicasaPublishing.c"
+#line 2745 "PicasaPublishing.c"
 	}
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return NULL;
-#line 2640 "PicasaPublishing.c"
+#line 2749 "PicasaPublishing.c"
 }
 
 
-GParamSpec* publishing_picasa_param_spec_album (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_picasa_param_spec_album (const gchar* name,
+                                    const gchar* nick,
+                                    const gchar* blurb,
+                                    GType object_type,
+                                    GParamFlags flags)
+{
 	PublishingPicasaParamSpecAlbum* spec;
 #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);
@@ -2666,20 +2781,25 @@ GParamSpec* publishing_picasa_param_spec_album (const gchar* name, const gchar*
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 2654 "PicasaPublishing.c"
+#line 2769 "PicasaPublishing.c"
 }
 
 
-gpointer publishing_picasa_value_get_album (const GValue* value) {
+gpointer
+publishing_picasa_value_get_album (const GValue* value)
+{
 #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 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return value->data[0].v_pointer;
-#line 2663 "PicasaPublishing.c"
+#line 2780 "PicasaPublishing.c"
 }
 
 
-void publishing_picasa_value_set_album (GValue* value, gpointer v_object) {
+void
+publishing_picasa_value_set_album (GValue* value,
+                                   gpointer v_object)
+{
 	PublishingPicasaAlbum * old;
 #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));
@@ -2695,22 +2815,25 @@ void publishing_picasa_value_set_album (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_album_ref (value->data[0].v_pointer);
-#line 2683 "PicasaPublishing.c"
+#line 2803 "PicasaPublishing.c"
 	} else {
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 2687 "PicasaPublishing.c"
+#line 2807 "PicasaPublishing.c"
 	}
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (old) {
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_album_unref (old);
-#line 2693 "PicasaPublishing.c"
+#line 2813 "PicasaPublishing.c"
 	}
 }
 
 
-void publishing_picasa_value_take_album (GValue* value, gpointer v_object) {
+void
+publishing_picasa_value_take_album (GValue* value,
+                                    gpointer v_object)
+{
 	PublishingPicasaAlbum * old;
 #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));
@@ -2724,38 +2847,44 @@ void publishing_picasa_value_take_album (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 2712 "PicasaPublishing.c"
+#line 2835 "PicasaPublishing.c"
 	} else {
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 2716 "PicasaPublishing.c"
+#line 2839 "PicasaPublishing.c"
 	}
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (old) {
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_album_unref (old);
-#line 2722 "PicasaPublishing.c"
+#line 2845 "PicasaPublishing.c"
 	}
 }
 
 
-static void publishing_picasa_album_class_init (PublishingPicasaAlbumClass * klass) {
+static void
+publishing_picasa_album_class_init (PublishingPicasaAlbumClass * klass)
+{
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_album_parent_class = g_type_class_peek_parent (klass);
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	((PublishingPicasaAlbumClass *) klass)->finalize = publishing_picasa_album_finalize;
-#line 2732 "PicasaPublishing.c"
+#line 2857 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_album_instance_init (PublishingPicasaAlbum * self) {
+static void
+publishing_picasa_album_instance_init (PublishingPicasaAlbum * self)
+{
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->ref_count = 1;
-#line 2739 "PicasaPublishing.c"
+#line 2866 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_album_finalize (PublishingPicasaAlbum * obj) {
+static void
+publishing_picasa_album_finalize (PublishingPicasaAlbum * obj)
+{
 	PublishingPicasaAlbum * self;
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PICASA_TYPE_ALBUM, PublishingPicasaAlbum);
@@ -2765,11 +2894,13 @@ static void publishing_picasa_album_finalize (PublishingPicasaAlbum * obj) {
 	_g_free0 (self->name);
 #line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->url);
-#line 2753 "PicasaPublishing.c"
+#line 2882 "PicasaPublishing.c"
 }
 
 
-GType publishing_picasa_album_get_type (void) {
+GType
+publishing_picasa_album_get_type (void)
+{
 	static volatile gsize publishing_picasa_album_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_picasa_album_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { publishing_picasa_value_album_init, publishing_picasa_value_album_free_value, publishing_picasa_value_album_copy_value, publishing_picasa_value_album_peek_pointer, "p", publishing_picasa_value_album_collect_value, "p", publishing_picasa_value_album_lcopy_value };
@@ -2783,18 +2914,22 @@ GType publishing_picasa_album_get_type (void) {
 }
 
 
-gpointer publishing_picasa_album_ref (gpointer instance) {
+gpointer
+publishing_picasa_album_ref (gpointer instance)
+{
 	PublishingPicasaAlbum * self;
 	self = instance;
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return instance;
-#line 2778 "PicasaPublishing.c"
+#line 2911 "PicasaPublishing.c"
 }
 
 
-void publishing_picasa_album_unref (gpointer instance) {
+void
+publishing_picasa_album_unref (gpointer instance)
+{
 	PublishingPicasaAlbum * self;
 	self = instance;
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2803,101 +2938,108 @@ void publishing_picasa_album_unref (gpointer instance) {
 		PUBLISHING_PICASA_ALBUM_GET_CLASS (self)->finalize (self);
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2791 "PicasaPublishing.c"
+#line 2926 "PicasaPublishing.c"
 	}
 }
 
 
-PublishingPicasaAlbumDirectoryTransaction* publishing_picasa_album_directory_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session) {
+PublishingPicasaAlbumDirectoryTransaction*
+publishing_picasa_album_directory_transaction_construct (GType object_type,
+                                                         PublishingRESTSupportGoogleSession* session)
+{
 	PublishingPicasaAlbumDirectoryTransaction* self = NULL;
-	PublishingRESTSupportGoogleSession* _tmp0_;
 #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 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = session;
-#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);
+	self = (PublishingPicasaAlbumDirectoryTransaction*) publishing_rest_support_google_publisher_authenticated_transaction_construct (object_type, session, PUBLISHING_PICASA_ALBUM_DIRECTORY_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
 #line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 2807 "PicasaPublishing.c"
+#line 2942 "PicasaPublishing.c"
 }
 
 
-PublishingPicasaAlbumDirectoryTransaction* publishing_picasa_album_directory_transaction_new (PublishingRESTSupportGoogleSession* session) {
+PublishingPicasaAlbumDirectoryTransaction*
+publishing_picasa_album_directory_transaction_new (PublishingRESTSupportGoogleSession* session)
+{
 #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 2814 "PicasaPublishing.c"
+#line 2951 "PicasaPublishing.c"
 }
 
 
-gchar* publishing_picasa_album_directory_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc) {
+gchar*
+publishing_picasa_album_directory_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc)
+{
 	gchar* result = NULL;
 	xmlNode* document_root = NULL;
-	PublishingRESTSupportXmlDocument* _tmp0_;
-	xmlNode* _tmp1_;
-	gboolean _tmp2_ = FALSE;
-	xmlNode* _tmp3_;
-	const gchar* _tmp4_;
+	xmlNode* _tmp0_;
+	gboolean _tmp1_ = FALSE;
+	xmlNode* _tmp2_;
+	const gchar* _tmp3_;
 #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 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = doc;
-#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp1_ = publishing_rest_support_xml_document_get_root_node (_tmp0_);
+	_tmp0_ = publishing_rest_support_xml_document_get_root_node (doc);
 #line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	document_root = _tmp1_;
+	document_root = _tmp0_;
 #line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp3_ = document_root;
+	_tmp2_ = document_root;
 #line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp4_ = _tmp3_->name;
+	_tmp3_ = _tmp2_->name;
 #line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (g_strcmp0 (_tmp4_, "feed") == 0) {
+	if (g_strcmp0 (_tmp3_, "feed") == 0) {
 #line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp2_ = TRUE;
-#line 2842 "PicasaPublishing.c"
+		_tmp1_ = TRUE;
+#line 2978 "PicasaPublishing.c"
 	} else {
-		xmlNode* _tmp5_;
-		const gchar* _tmp6_;
+		xmlNode* _tmp4_;
+		const gchar* _tmp5_;
 #line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp5_ = document_root;
+		_tmp4_ = document_root;
 #line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp6_ = _tmp5_->name;
+		_tmp5_ = _tmp4_->name;
 #line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp2_ = g_strcmp0 (_tmp6_, "entry") == 0;
-#line 2852 "PicasaPublishing.c"
+		_tmp1_ = g_strcmp0 (_tmp5_, "entry") == 0;
+#line 2988 "PicasaPublishing.c"
 	}
 #line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (_tmp2_) {
+	if (_tmp1_) {
 #line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		result = NULL;
 #line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return result;
-#line 2860 "PicasaPublishing.c"
+#line 2996 "PicasaPublishing.c"
 	} else {
-		gchar* _tmp7_;
+		gchar* _tmp6_;
 #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp7_ = g_strdup ("response root node isn't a <feed> or <entry>");
+		_tmp6_ = g_strdup ("response root node isn't a <feed> or <entry>");
 #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		result = _tmp7_;
+		result = _tmp6_;
 #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return result;
-#line 2869 "PicasaPublishing.c"
+#line 3005 "PicasaPublishing.c"
 	}
 }
 
 
-static void publishing_picasa_album_directory_transaction_class_init (PublishingPicasaAlbumDirectoryTransactionClass * klass) {
+static void
+publishing_picasa_album_directory_transaction_class_init (PublishingPicasaAlbumDirectoryTransactionClass * klass)
+{
 #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 2877 "PicasaPublishing.c"
+#line 3015 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_album_directory_transaction_instance_init (PublishingPicasaAlbumDirectoryTransaction * self) {
+static void
+publishing_picasa_album_directory_transaction_instance_init (PublishingPicasaAlbumDirectoryTransaction * self)
+{
 }
 
 
-GType publishing_picasa_album_directory_transaction_get_type (void) {
+GType
+publishing_picasa_album_directory_transaction_get_type (void)
+{
 	static volatile gsize publishing_picasa_album_directory_transaction_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_picasa_album_directory_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingPicasaAlbumDirectoryTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_picasa_album_directory_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPicasaAlbumDirectoryTransaction), 0, (GInstanceInitFunc) publishing_picasa_album_directory_transaction_instance_init, NULL };
@@ -2909,36 +3051,36 @@ GType publishing_picasa_album_directory_transaction_get_type (void) {
 }
 
 
-static gpointer _publishing_rest_support_session_ref0 (gpointer self) {
+static gpointer
+_publishing_rest_support_session_ref0 (gpointer self)
+{
 #line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self ? publishing_rest_support_session_ref (self) : NULL;
-#line 2900 "PicasaPublishing.c"
+#line 3044 "PicasaPublishing.c"
 }
 
 
-static gpointer _publishing_picasa_publishing_parameters_ref0 (gpointer self) {
+static gpointer
+_publishing_picasa_publishing_parameters_ref0 (gpointer self)
+{
 #line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self ? publishing_picasa_publishing_parameters_ref (self) : NULL;
-#line 2907 "PicasaPublishing.c"
+#line 3053 "PicasaPublishing.c"
 }
 
 
-PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session, PublishingPicasaPublishingParameters* parameters, SpitPublishingPublishable* publishable) {
+PublishingPicasaUploadTransaction*
+publishing_picasa_upload_transaction_construct (GType object_type,
+                                                PublishingRESTSupportGoogleSession* session,
+                                                PublishingPicasaPublishingParameters* parameters,
+                                                SpitPublishingPublishable* publishable)
+{
 	PublishingPicasaUploadTransaction* self = NULL;
-	PublishingRESTSupportGoogleSession* _tmp0_;
-	PublishingPicasaPublishingParameters* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	PublishingRESTSupportGoogleSession* _tmp4_;
-	gboolean _tmp5_;
-	PublishingRESTSupportGoogleSession* _tmp6_;
-	PublishingRESTSupportGoogleSession* _tmp7_;
-	PublishingPicasaPublishingParameters* _tmp8_;
-	PublishingPicasaPublishingParameters* _tmp9_;
-	SpitPublishingPublishable* _tmp10_;
-	SpitPublishingPublishable* _tmp11_;
-	SpitPublishingPublishable* _tmp12_;
-	SpitPublishingPublisherMediaType _tmp13_;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	PublishingRESTSupportGoogleSession* _tmp2_;
+	PublishingPicasaPublishingParameters* _tmp3_;
+	SpitPublishingPublishable* _tmp4_;
 	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);
@@ -2947,115 +3089,97 @@ PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_construc
 #line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
 #line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = session;
+	_tmp0_ = publishing_picasa_publishing_parameters_get_target_album_feed_url (parameters);
 #line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp1_ = parameters;
-#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp2_ = publishing_picasa_publishing_parameters_get_target_album_feed_url (_tmp1_);
-#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp3_ = _tmp2_;
+	_tmp1_ = _tmp0_;
 #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);
+	self = (PublishingPicasaUploadTransaction*) publishing_rest_support_google_publisher_authenticated_transaction_construct (object_type, session, _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
 #line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (_tmp3_);
-#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp4_ = session;
-#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));
+	_g_free0 (_tmp1_);
 #line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_vala_assert (_tmp5_, "session.is_authenticated()");
+	_vala_assert (publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)), "session.is_authenticated()");
 #line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp6_ = session;
-#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp7_ = _publishing_rest_support_session_ref0 (_tmp6_);
+	_tmp2_ = _publishing_rest_support_session_ref0 (session);
 #line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
 #line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->session = _tmp7_;
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp8_ = parameters;
+	self->priv->session = _tmp2_;
 #line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp9_ = _publishing_picasa_publishing_parameters_ref0 (_tmp8_);
+	_tmp3_ = _publishing_picasa_publishing_parameters_ref0 (parameters);
 #line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_picasa_publishing_parameters_unref0 (self->priv->parameters);
 #line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->parameters = _tmp9_;
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp10_ = publishable;
+	self->priv->parameters = _tmp3_;
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp11_ = _g_object_ref0 (_tmp10_);
+	_tmp4_ = _g_object_ref0 (publishable);
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->publishable);
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->publishable = _tmp11_;
-#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_);
+	self->priv->publishable = _tmp4_;
 #line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (_tmp13_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 2982 "PicasaPublishing.c"
+	if (spit_publishing_publishable_get_media_type (publishable) == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+#line 3106 "PicasaPublishing.c"
 		{
 			GFileInfo* info = NULL;
-			SpitPublishingPublishable* _tmp14_;
-			GFile* _tmp15_;
-			GFile* _tmp16_;
-			GFileInfo* _tmp17_;
-			GFileInfo* _tmp18_;
-			GFileInfo* _tmp19_;
-			const gchar* _tmp20_;
-			gchar* _tmp21_;
+			SpitPublishingPublishable* _tmp5_;
+			GFile* _tmp6_;
+			GFile* _tmp7_;
+			GFileInfo* _tmp8_;
+			GFileInfo* _tmp9_;
+			GFileInfo* _tmp10_;
+			const gchar* _tmp11_;
+			gchar* _tmp12_;
 #line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp14_ = self->priv->publishable;
+			_tmp5_ = self->priv->publishable;
 #line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp15_ = spit_publishing_publishable_get_serialized_file (_tmp14_);
+			_tmp6_ = spit_publishing_publishable_get_serialized_file (_tmp5_);
 #line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp16_ = _tmp15_;
+			_tmp7_ = _tmp6_;
 #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_);
+			_tmp8_ = g_file_query_info (_tmp7_, 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_;
+			_tmp9_ = _tmp8_;
 #line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_g_object_unref0 (_tmp16_);
+			_g_object_unref0 (_tmp7_);
 #line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			info = _tmp18_;
+			info = _tmp9_;
 #line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3009 "PicasaPublishing.c"
+#line 3133 "PicasaPublishing.c"
 				goto __catch10_g_error;
 			}
 #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp19_ = info;
+			_tmp10_ = info;
 #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp20_ = g_file_info_get_content_type (_tmp19_);
+			_tmp11_ = g_file_info_get_content_type (_tmp10_);
 #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp21_ = g_content_type_get_mime_type (_tmp20_);
+			_tmp12_ = g_content_type_get_mime_type (_tmp11_);
 #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_;
+			self->priv->mime_type = _tmp12_;
 #line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_object_unref0 (info);
-#line 3024 "PicasaPublishing.c"
+#line 3148 "PicasaPublishing.c"
 		}
 		goto __finally10;
 		__catch10_g_error:
 		{
 			GError* err = NULL;
-			gchar* _tmp22_;
+			gchar* _tmp13_;
 #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");
+			_tmp13_ = 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_;
+			self->priv->mime_type = _tmp13_;
 #line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_error_free0 (err);
-#line 3043 "PicasaPublishing.c"
+#line 3167 "PicasaPublishing.c"
 		}
 		__finally10:
 #line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -3066,610 +3190,476 @@ PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_construc
 			g_clear_error (&_inner_error_);
 #line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return NULL;
-#line 3054 "PicasaPublishing.c"
+#line 3178 "PicasaPublishing.c"
 		}
 	} else {
-		gchar* _tmp23_;
+		gchar* _tmp14_;
 #line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp23_ = g_strdup ("image/jpeg");
+		_tmp14_ = 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 3064 "PicasaPublishing.c"
+		self->priv->mime_type = _tmp14_;
+#line 3188 "PicasaPublishing.c"
 	}
 #line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 3068 "PicasaPublishing.c"
+#line 3192 "PicasaPublishing.c"
 }
 
 
-PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_new (PublishingRESTSupportGoogleSession* session, PublishingPicasaPublishingParameters* parameters, SpitPublishingPublishable* publishable) {
+PublishingPicasaUploadTransaction*
+publishing_picasa_upload_transaction_new (PublishingRESTSupportGoogleSession* session,
+                                          PublishingPicasaPublishingParameters* parameters,
+                                          SpitPublishingPublishable* publishable)
+{
 #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 3075 "PicasaPublishing.c"
+#line 3203 "PicasaPublishing.c"
 }
 
 
-static glong string_strnlen (gchar* str, glong maxlen) {
+static glong
+string_strnlen (gchar* str,
+                glong maxlen)
+{
 	glong result = 0L;
 	gchar* end = NULL;
 	gchar* _tmp0_;
-	glong _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = str;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = maxlen;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	end = _tmp2_;
-#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp3_ = end;
-#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp3_ == NULL) {
-#line 3098 "PicasaPublishing.c"
-		glong _tmp4_;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4_ = maxlen;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = _tmp4_;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	gchar* _tmp1_;
+#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp0_ = memchr (str, 0, (gsize) maxlen);
+#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	end = _tmp0_;
+#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp1_ = end;
+#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (_tmp1_ == NULL) {
+#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		result = maxlen;
+#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return result;
-#line 3106 "PicasaPublishing.c"
+#line 3227 "PicasaPublishing.c"
 	} else {
-		gchar* _tmp5_;
-		gchar* _tmp6_;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp5_ = end;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp6_ = str;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = (glong) (_tmp5_ - _tmp6_);
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		gchar* _tmp2_;
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp2_ = end;
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		result = (glong) (_tmp2_ - str);
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return result;
-#line 3118 "PicasaPublishing.c"
+#line 3236 "PicasaPublishing.c"
 	}
 }
 
 
-static gchar* string_substring (const gchar* self, glong offset, glong len) {
+static gchar*
+string_substring (const gchar* self,
+                  glong offset,
+                  glong len)
+{
 	gchar* result = NULL;
 	glong string_length = 0L;
 	gboolean _tmp0_ = FALSE;
-	glong _tmp1_;
-	glong _tmp8_;
-	glong _tmp14_;
-	glong _tmp17_;
-	glong _tmp18_;
-	glong _tmp19_;
-	glong _tmp20_;
-	glong _tmp21_;
-	gchar* _tmp22_;
-#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	glong _tmp6_;
+	gchar* _tmp7_;
+#line 1347 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = offset;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp1_ >= ((glong) 0)) {
-#line 3142 "PicasaPublishing.c"
-		glong _tmp2_;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp2_ = len;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 3148 "PicasaPublishing.c"
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (offset >= ((glong) 0)) {
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp0_ = len >= ((glong) 0);
+#line 3257 "PicasaPublishing.c"
 	} else {
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 3152 "PicasaPublishing.c"
+#line 3261 "PicasaPublishing.c"
 	}
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 3156 "PicasaPublishing.c"
-		glong _tmp3_;
-		glong _tmp4_;
-		glong _tmp5_;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp3_ = offset;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4_ = len;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		string_length = _tmp5_;
-#line 3168 "PicasaPublishing.c"
+#line 1351 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		string_length = string_strnlen ((gchar*) self, offset + len);
+#line 3267 "PicasaPublishing.c"
 	} else {
-		gint _tmp6_;
-		gint _tmp7_;
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp6_ = strlen (self);
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp7_ = _tmp6_;
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		string_length = (glong) _tmp7_;
-#line 3178 "PicasaPublishing.c"
+		gint _tmp1_;
+		gint _tmp2_;
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp1_ = strlen (self);
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp2_ = _tmp1_;
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		string_length = (glong) _tmp2_;
+#line 3277 "PicasaPublishing.c"
 	}
-#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp8_ = offset;
-#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp8_ < ((glong) 0)) {
-#line 3184 "PicasaPublishing.c"
-		glong _tmp9_;
-		glong _tmp10_;
-		glong _tmp11_;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp9_ = string_length;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp10_ = offset;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		offset = _tmp9_ + _tmp10_;
-#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp11_ = offset;
-#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 3198 "PicasaPublishing.c"
+#line 1356 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (offset < ((glong) 0)) {
+#line 3281 "PicasaPublishing.c"
+		glong _tmp3_;
+#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp3_ = string_length;
+#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		offset = _tmp3_ + offset;
+#line 1358 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		g_return_val_if_fail (offset >= ((glong) 0), NULL);
+#line 3289 "PicasaPublishing.c"
 	} else {
-		glong _tmp12_;
-		glong _tmp13_;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp12_ = offset;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp13_ = string_length;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 3208 "PicasaPublishing.c"
+		glong _tmp4_;
+#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp4_ = string_length;
+#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		g_return_val_if_fail (offset <= _tmp4_, NULL);
+#line 3296 "PicasaPublishing.c"
 	}
-#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp14_ = len;
-#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp14_ < ((glong) 0)) {
-#line 3214 "PicasaPublishing.c"
-		glong _tmp15_;
-		glong _tmp16_;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp15_ = string_length;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp16_ = offset;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		len = _tmp15_ - _tmp16_;
-#line 3223 "PicasaPublishing.c"
+#line 1362 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (len < ((glong) 0)) {
+#line 3300 "PicasaPublishing.c"
+		glong _tmp5_;
+#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp5_ = string_length;
+#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		len = _tmp5_ - offset;
+#line 3306 "PicasaPublishing.c"
 	}
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp17_ = offset;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp18_ = len;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp19_ = string_length;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp20_ = offset;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp21_ = len;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	result = _tmp22_;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp6_ = string_length;
+#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	g_return_val_if_fail ((offset + len) <= _tmp6_, NULL);
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp7_ = g_strndup (((gchar*) self) + offset, (gsize) len);
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	result = _tmp7_;
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	return result;
-#line 3243 "PicasaPublishing.c"
+#line 3318 "PicasaPublishing.c"
 }
 
 
-static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int str_array_length1) {
+static gchar*
+_vala_g_strjoinv (const gchar* separator,
+                  gchar** str_array,
+                  int str_array_length1)
+{
 	gchar* result = NULL;
-	const gchar* _tmp0_;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-	gchar** _tmp3_;
-	gint _tmp3__length1;
-#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = separator;
-#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp0_ == NULL) {
-#line 1079 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	gboolean _tmp0_ = FALSE;
+#line 1092 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (separator == NULL) {
+#line 1093 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		separator = "";
-#line 3260 "PicasaPublishing.c"
-	}
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp3_ = str_array;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp3__length1 = str_array_length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp3_ != NULL) {
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp2_ = TRUE;
-#line 3270 "PicasaPublishing.c"
-	} else {
-		gchar** _tmp4_;
-		gint _tmp4__length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4_ = str_array;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4__length1 = str_array_length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp2_ = _tmp4__length1 > 0;
-#line 3280 "PicasaPublishing.c"
+#line 3333 "PicasaPublishing.c"
 	}
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp2_) {
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp1_ = TRUE;
-#line 3286 "PicasaPublishing.c"
-	} else {
-		gboolean _tmp5_ = FALSE;
-		gchar** _tmp6_;
-		gint _tmp6__length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp6_ = str_array;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp6__length1 = str_array_length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		if (_tmp6__length1 == -1) {
-#line 3297 "PicasaPublishing.c"
-			gchar** _tmp7_;
-			gint _tmp7__length1;
-			const gchar* _tmp8_;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp7_ = str_array;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp7__length1 = str_array_length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp8_ = _tmp7_[0];
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp5_ = _tmp8_ != NULL;
-#line 3309 "PicasaPublishing.c"
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (str_array != NULL) {
+#line 3337 "PicasaPublishing.c"
+		gboolean _tmp1_ = FALSE;
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		if (str_array_length1 > 0) {
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+			_tmp1_ = TRUE;
+#line 3343 "PicasaPublishing.c"
 		} else {
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp5_ = FALSE;
-#line 3313 "PicasaPublishing.c"
+			gboolean _tmp2_ = FALSE;
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+			if (str_array_length1 == -1) {
+#line 3348 "PicasaPublishing.c"
+				const gchar* _tmp3_;
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp3_ = str_array[0];
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp2_ = _tmp3_ != NULL;
+#line 3354 "PicasaPublishing.c"
+			} else {
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp2_ = FALSE;
+#line 3358 "PicasaPublishing.c"
+			}
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+			_tmp1_ = _tmp2_;
+#line 3362 "PicasaPublishing.c"
 		}
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp1_ = _tmp5_;
-#line 3317 "PicasaPublishing.c"
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp0_ = _tmp1_;
+#line 3366 "PicasaPublishing.c"
+	} else {
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp0_ = FALSE;
+#line 3370 "PicasaPublishing.c"
 	}
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp1_) {
-#line 3321 "PicasaPublishing.c"
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (_tmp0_) {
+#line 3374 "PicasaPublishing.c"
 		gint i = 0;
 		gsize len = 0UL;
-		gint _tmp31_;
-		gint _tmp33_;
-		gint _tmp34_;
-		gsize _tmp35_;
-		const gchar* _tmp36_;
-		gint _tmp37_;
-		gint _tmp38_;
-		gint _tmp39_;
+		gint _tmp20_;
+		gint _tmp22_;
+		gint _tmp23_;
+		gsize _tmp24_;
+		gint _tmp25_;
+		gint _tmp26_;
+		gint _tmp27_;
 		const gchar* res = NULL;
-		gsize _tmp40_;
-		void* _tmp41_;
+		gsize _tmp28_;
+		void* _tmp29_;
 		void* ptr = NULL;
-		const gchar* _tmp42_;
-		gchar** _tmp43_;
-		gint _tmp43__length1;
-		const gchar* _tmp44_;
-		void* _tmp45_;
-		const gchar* _tmp62_;
-#line 1083 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		const gchar* _tmp30_;
+		const gchar* _tmp31_;
+		void* _tmp32_;
+		const gchar* _tmp45_;
+#line 1097 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		len = (gsize) 1;
-#line 3344 "PicasaPublishing.c"
+#line 3394 "PicasaPublishing.c"
 		{
-			gboolean _tmp9_ = FALSE;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+			gboolean _tmp4_ = FALSE;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			i = 0;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp9_ = TRUE;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+			_tmp4_ = TRUE;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			while (TRUE) {
-#line 3353 "PicasaPublishing.c"
-				gboolean _tmp11_ = FALSE;
-				gboolean _tmp12_ = FALSE;
-				gchar** _tmp13_;
-				gint _tmp13__length1;
-				gint _tmp21_ = 0;
-				gchar** _tmp22_;
-				gint _tmp22__length1;
-				gint _tmp23_;
-				const gchar* _tmp24_;
-				gsize _tmp30_;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (!_tmp9_) {
-#line 3366 "PicasaPublishing.c"
-					gint _tmp10_;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp10_ = i;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					i = _tmp10_ + 1;
-#line 3372 "PicasaPublishing.c"
+#line 3403 "PicasaPublishing.c"
+				gboolean _tmp6_ = FALSE;
+				gboolean _tmp7_ = FALSE;
+				gint _tmp12_ = 0;
+				gint _tmp13_;
+				const gchar* _tmp14_;
+				gsize _tmp19_;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				if (!_tmp4_) {
+#line 3412 "PicasaPublishing.c"
+					gint _tmp5_;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp5_ = i;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					i = _tmp5_ + 1;
+#line 3418 "PicasaPublishing.c"
 				}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp9_ = FALSE;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp13_ = str_array;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp13__length1 = str_array_length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (_tmp13__length1 != -1) {
-#line 3382 "PicasaPublishing.c"
-					gint _tmp14_;
-					gchar** _tmp15_;
-					gint _tmp15__length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp14_ = i;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp15_ = str_array;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp15__length1 = str_array_length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp12_ = _tmp14_ < _tmp15__length1;
-#line 3394 "PicasaPublishing.c"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp4_ = FALSE;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				if (str_array_length1 != -1) {
+#line 3424 "PicasaPublishing.c"
+					gint _tmp8_;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp8_ = i;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp7_ = _tmp8_ < str_array_length1;
+#line 3430 "PicasaPublishing.c"
 				} else {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp12_ = FALSE;
-#line 3398 "PicasaPublishing.c"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp7_ = FALSE;
+#line 3434 "PicasaPublishing.c"
 				}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (_tmp12_) {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp11_ = TRUE;
-#line 3404 "PicasaPublishing.c"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				if (_tmp7_) {
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp6_ = TRUE;
+#line 3440 "PicasaPublishing.c"
 				} else {
-					gboolean _tmp16_ = FALSE;
-					gchar** _tmp17_;
-					gint _tmp17__length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp17_ = str_array;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp17__length1 = str_array_length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					if (_tmp17__length1 == -1) {
-#line 3415 "PicasaPublishing.c"
-						gchar** _tmp18_;
-						gint _tmp18__length1;
-						gint _tmp19_;
-						const gchar* _tmp20_;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-						_tmp18_ = str_array;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-						_tmp18__length1 = str_array_length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-						_tmp19_ = i;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-						_tmp20_ = _tmp18_[_tmp19_];
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-						_tmp16_ = _tmp20_ != NULL;
-#line 3430 "PicasaPublishing.c"
+					gboolean _tmp9_ = FALSE;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					if (str_array_length1 == -1) {
+#line 3445 "PicasaPublishing.c"
+						gint _tmp10_;
+						const gchar* _tmp11_;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+						_tmp10_ = i;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+						_tmp11_ = str_array[_tmp10_];
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+						_tmp9_ = _tmp11_ != NULL;
+#line 3454 "PicasaPublishing.c"
 					} else {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-						_tmp16_ = FALSE;
-#line 3434 "PicasaPublishing.c"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+						_tmp9_ = FALSE;
+#line 3458 "PicasaPublishing.c"
 					}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp11_ = _tmp16_;
-#line 3438 "PicasaPublishing.c"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp6_ = _tmp9_;
+#line 3462 "PicasaPublishing.c"
 				}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (!_tmp11_) {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				if (!_tmp6_) {
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 					break;
-#line 3444 "PicasaPublishing.c"
+#line 3468 "PicasaPublishing.c"
 				}
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp22_ = str_array;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp22__length1 = str_array_length1;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp23_ = i;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp24_ = _tmp22_[_tmp23_];
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (_tmp24_ != NULL) {
-#line 3456 "PicasaPublishing.c"
-					gchar** _tmp25_;
-					gint _tmp25__length1;
-					gint _tmp26_;
-					const gchar* _tmp27_;
-					gint _tmp28_;
-					gint _tmp29_;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp25_ = str_array;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp25__length1 = str_array_length1;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp26_ = i;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp27_ = _tmp25_[_tmp26_];
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp28_ = strlen ((const gchar*) _tmp27_);
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp29_ = _tmp28_;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp21_ = _tmp29_;
-#line 3477 "PicasaPublishing.c"
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp13_ = i;
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp14_ = str_array[_tmp13_];
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				if (_tmp14_ != NULL) {
+#line 3476 "PicasaPublishing.c"
+					gint _tmp15_;
+					const gchar* _tmp16_;
+					gint _tmp17_;
+					gint _tmp18_;
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp15_ = i;
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp16_ = str_array[_tmp15_];
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp17_ = strlen ((const gchar*) _tmp16_);
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp18_ = _tmp17_;
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp12_ = _tmp18_;
+#line 3491 "PicasaPublishing.c"
 				} else {
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp21_ = 0;
-#line 3481 "PicasaPublishing.c"
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp12_ = 0;
+#line 3495 "PicasaPublishing.c"
 				}
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp30_ = len;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				len = _tmp30_ + _tmp21_;
-#line 3487 "PicasaPublishing.c"
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp19_ = len;
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				len = _tmp19_ + _tmp12_;
+#line 3501 "PicasaPublishing.c"
 			}
 		}
-#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp31_ = i;
-#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		if (_tmp31_ == 0) {
-#line 3494 "PicasaPublishing.c"
-			gchar* _tmp32_;
-#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp32_ = g_strdup ("");
-#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			result = _tmp32_;
-#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1101 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp20_ = i;
+#line 1101 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		if (_tmp20_ == 0) {
+#line 3508 "PicasaPublishing.c"
+			gchar* _tmp21_;
+#line 1102 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+			_tmp21_ = g_strdup ("");
+#line 1102 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+			result = _tmp21_;
+#line 1102 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			return result;
-#line 3502 "PicasaPublishing.c"
+#line 3516 "PicasaPublishing.c"
 		}
-#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp33_ = i;
-#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		str_array_length1 = _tmp33_;
-#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp34_ = str_array_length1;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp35_ = len;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp36_ = separator;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp37_ = strlen ((const gchar*) _tmp36_);
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp38_ = _tmp37_;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp39_ = i;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1));
-#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp40_ = len;
-#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp41_ = g_malloc (_tmp40_);
-#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		res = _tmp41_;
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp42_ = res;
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp43_ = str_array;
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp43__length1 = str_array_length1;
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp44_ = _tmp43_[0];
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		ptr = _tmp45_;
-#line 3540 "PicasaPublishing.c"
+#line 1104 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp22_ = i;
+#line 1104 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		str_array_length1 = _tmp22_;
+#line 1104 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp23_ = str_array_length1;
+#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp24_ = len;
+#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp25_ = strlen ((const gchar*) separator);
+#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp26_ = _tmp25_;
+#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp27_ = i;
+#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		len = _tmp24_ + (_tmp26_ * (_tmp27_ - 1));
+#line 1107 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp28_ = len;
+#line 1107 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp29_ = g_malloc (_tmp28_);
+#line 1107 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		res = _tmp29_;
+#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp30_ = res;
+#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp31_ = str_array[0];
+#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp32_ = g_stpcpy ((void*) _tmp30_, (const gchar*) _tmp31_);
+#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		ptr = _tmp32_;
+#line 3548 "PicasaPublishing.c"
 		{
-			gboolean _tmp46_ = FALSE;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+			gboolean _tmp33_ = FALSE;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			i = 1;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp46_ = TRUE;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+			_tmp33_ = TRUE;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			while (TRUE) {
-#line 3549 "PicasaPublishing.c"
-				gint _tmp48_;
-				gchar** _tmp49_;
-				gint _tmp49__length1;
-				void* _tmp50_;
-				const gchar* _tmp51_;
-				void* _tmp52_;
-				const gchar* _tmp53_ = NULL;
-				gchar** _tmp54_;
-				gint _tmp54__length1;
-				gint _tmp55_;
-				const gchar* _tmp56_;
-				void* _tmp60_;
-				void* _tmp61_;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (!_tmp46_) {
-#line 3565 "PicasaPublishing.c"
-					gint _tmp47_;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp47_ = i;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					i = _tmp47_ + 1;
-#line 3571 "PicasaPublishing.c"
+#line 3557 "PicasaPublishing.c"
+				gint _tmp35_;
+				void* _tmp36_;
+				void* _tmp37_;
+				const gchar* _tmp38_ = NULL;
+				gint _tmp39_;
+				const gchar* _tmp40_;
+				void* _tmp43_;
+				void* _tmp44_;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				if (!_tmp33_) {
+#line 3568 "PicasaPublishing.c"
+					gint _tmp34_;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp34_ = i;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					i = _tmp34_ + 1;
+#line 3574 "PicasaPublishing.c"
 				}
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp46_ = FALSE;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp48_ = i;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp49_ = str_array;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp49__length1 = str_array_length1;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (!(_tmp48_ < _tmp49__length1)) {
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp33_ = FALSE;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp35_ = i;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				if (!(_tmp35_ < str_array_length1)) {
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 					break;
-#line 3585 "PicasaPublishing.c"
+#line 3584 "PicasaPublishing.c"
 				}
-#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp50_ = ptr;
-#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp51_ = separator;
-#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_);
-#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				ptr = _tmp52_;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp54_ = str_array;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp54__length1 = str_array_length1;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp55_ = i;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp56_ = _tmp54_[_tmp55_];
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (_tmp56_ != NULL) {
-#line 3605 "PicasaPublishing.c"
-					gchar** _tmp57_;
-					gint _tmp57__length1;
-					gint _tmp58_;
-					const gchar* _tmp59_;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp57_ = str_array;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp57__length1 = str_array_length1;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp58_ = i;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp59_ = _tmp57_[_tmp58_];
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp53_ = (const gchar*) _tmp59_;
-#line 3620 "PicasaPublishing.c"
+#line 1110 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp36_ = ptr;
+#line 1110 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp37_ = g_stpcpy (_tmp36_, (const gchar*) separator);
+#line 1110 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				ptr = _tmp37_;
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp39_ = i;
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp40_ = str_array[_tmp39_];
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				if (_tmp40_ != NULL) {
+#line 3598 "PicasaPublishing.c"
+					gint _tmp41_;
+					const gchar* _tmp42_;
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp41_ = i;
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp42_ = str_array[_tmp41_];
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp38_ = (const gchar*) _tmp42_;
+#line 3607 "PicasaPublishing.c"
 				} else {
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp53_ = "";
-#line 3624 "PicasaPublishing.c"
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp38_ = "";
+#line 3611 "PicasaPublishing.c"
 				}
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp60_ = ptr;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				ptr = _tmp61_;
-#line 3632 "PicasaPublishing.c"
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp43_ = ptr;
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp44_ = g_stpcpy (_tmp43_, _tmp38_);
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				ptr = _tmp44_;
+#line 3619 "PicasaPublishing.c"
 			}
 		}
-#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp62_ = res;
-#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp45_ = res;
+#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		res = NULL;
-#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = (gchar*) _tmp62_;
-#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		result = (gchar*) _tmp45_;
+#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return result;
-#line 3643 "PicasaPublishing.c"
+#line 3630 "PicasaPublishing.c"
 	} else {
-		gchar* _tmp63_;
-#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp63_ = g_strdup ("");
-#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = _tmp63_;
-#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		gchar* _tmp46_;
+#line 1116 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp46_ = g_strdup ("");
+#line 1116 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		result = _tmp46_;
+#line 1116 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return result;
-#line 3652 "PicasaPublishing.c"
+#line 3639 "PicasaPublishing.c"
 	}
 }
 
 
-static guint8* string_get_data (const gchar* self, int* result_length1) {
+static guint8*
+string_get_data (const gchar* self,
+                 int* result_length1)
+{
 	guint8* result;
 	guint8* res = NULL;
 	gint res_length1;
@@ -3681,59 +3671,66 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
 	gint _tmp3__length1;
 	guint8* _tmp4_;
 	gint _tmp4__length1;
-#line 1428 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1442 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1443 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	res = (guint8*) self;
-#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1443 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	res_length1 = -1;
-#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1443 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	_res_size_ = res_length1;
-#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	res_length1 = (gint) _tmp1_;
-#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	_tmp2_ = res_length1;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	_tmp3_ = res;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	_tmp3__length1 = res_length1;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	_tmp4_ = _tmp3_;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	_tmp4__length1 = _tmp3__length1;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	if (result_length1) {
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp4__length1;
-#line 3697 "PicasaPublishing.c"
+#line 3687 "PicasaPublishing.c"
 	}
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	return result;
-#line 3703 "PicasaPublishing.c"
+#line 3693 "PicasaPublishing.c"
 }
 
 
-static void _vala_SoupBuffer_free (SoupBuffer* self) {
+static void
+_vala_SoupBuffer_free (SoupBuffer* self)
+{
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_boxed_free (soup_buffer_get_type (), self);
-#line 3710 "PicasaPublishing.c"
+#line 3702 "PicasaPublishing.c"
 }
 
 
-static void _vala_SoupMultipart_free (SoupMultipart* self) {
+static void
+_vala_SoupMultipart_free (SoupMultipart* self)
+{
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_boxed_free (soup_multipart_get_type (), self);
-#line 3717 "PicasaPublishing.c"
+#line 3711 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) {
+static void
+publishing_picasa_upload_transaction_real_execute (PublishingRESTSupportTransaction* base,
+                                                   GError** error)
+{
 	PublishingPicasaUploadTransaction * self;
 	SoupMultipart* message_parts = NULL;
 	SoupMultipart* _tmp0_;
@@ -3754,53 +3751,52 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 	gchar** _tmp16_;
 	gint _tmp16__length1;
 	gchar* metadata = NULL;
-	SpitPublishingPublishable* _tmp51_;
+	SpitPublishingPublishable* _tmp50_;
+	gchar* _tmp51_;
 	gchar* _tmp52_;
 	gchar* _tmp53_;
 	gchar* _tmp54_;
-	gchar* _tmp55_;
+	const gchar* _tmp55_;
 	const gchar* _tmp56_;
-	const gchar* _tmp57_;
+	gchar* _tmp57_;
 	gchar* _tmp58_;
-	gchar* _tmp59_;
 	SoupBuffer* metadata_buffer = NULL;
-	const gchar* _tmp60_;
+	const gchar* _tmp59_;
+	guint8* _tmp60_;
+	gint _tmp60__length1;
 	guint8* _tmp61_;
 	gint _tmp61__length1;
-	guint8* _tmp62_;
-	gint _tmp62__length1;
-	SoupBuffer* _tmp63_;
-	SoupMultipart* _tmp64_;
-	SoupBuffer* _tmp65_;
+	SoupBuffer* _tmp62_;
+	SoupMultipart* _tmp63_;
+	SoupBuffer* _tmp64_;
 	guint8* photo_data = NULL;
-	GMappedFile* _tmp87_;
-	gchar* _tmp88_;
+	GMappedFile* _tmp86_;
+	gchar* _tmp87_;
 	gint photo_data_length1;
 	gint _photo_data_size_;
-	GMappedFile* _tmp89_;
-	gsize _tmp90_;
-	gint _tmp91_;
+	GMappedFile* _tmp88_;
+	gint _tmp89_;
 	SoupBuffer* bindable_data = NULL;
-	SoupBuffer* _tmp92_;
-	SoupMultipart* _tmp93_;
-	SpitPublishingPublishable* _tmp94_;
-	GFile* _tmp95_;
-	GFile* _tmp96_;
-	gchar* _tmp97_;
-	gchar* _tmp98_;
-	const gchar* _tmp99_;
+	SoupBuffer* _tmp90_;
+	SoupMultipart* _tmp91_;
+	SpitPublishingPublishable* _tmp92_;
+	GFile* _tmp93_;
+	GFile* _tmp94_;
+	gchar* _tmp95_;
+	gchar* _tmp96_;
+	const gchar* _tmp97_;
 	SoupMessage* outbound_message = NULL;
-	gchar* _tmp100_;
-	gchar* _tmp101_;
-	SoupMultipart* _tmp102_;
-	SoupMessage* _tmp103_;
-	SoupMessage* _tmp104_;
-	SoupMessageHeaders* _tmp105_;
-	PublishingRESTSupportGoogleSession* _tmp106_;
+	gchar* _tmp98_;
+	gchar* _tmp99_;
+	SoupMultipart* _tmp100_;
+	SoupMessage* _tmp101_;
+	SoupMessage* _tmp102_;
+	SoupMessageHeaders* _tmp103_;
+	PublishingRESTSupportGoogleSession* _tmp104_;
+	gchar* _tmp105_;
+	gchar* _tmp106_;
 	gchar* _tmp107_;
 	gchar* _tmp108_;
-	gchar* _tmp109_;
-	gchar* _tmp110_;
 	GError * _inner_error_ = NULL;
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_UPLOAD_TRANSACTION, PublishingPicasaUploadTransaction);
@@ -3824,7 +3820,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 	_g_free0 (_tmp4_);
 #line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (_tmp5_) {
-#line 3812 "PicasaPublishing.c"
+#line 3808 "PicasaPublishing.c"
 		SpitPublishingPublishable* _tmp6_;
 		gchar* _tmp7_;
 		gchar* _tmp8_;
@@ -3851,7 +3847,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 		_g_free0 (_tmp10_);
 #line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_free0 (_tmp8_);
-#line 3839 "PicasaPublishing.c"
+#line 3835 "PicasaPublishing.c"
 	}
 #line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp12_ = self->priv->publishable;
@@ -3873,23 +3869,23 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 	_tmp16__length1 = keywords_length1;
 #line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (_tmp16__length1 > 0) {
-#line 3861 "PicasaPublishing.c"
-		const gchar* _tmp47_;
-		gchar* _tmp48_;
-		const gchar* _tmp49_;
-		gchar* _tmp50_;
+#line 3857 "PicasaPublishing.c"
+		const gchar* _tmp46_;
+		gchar* _tmp47_;
+		const gchar* _tmp48_;
+		gchar* _tmp49_;
 		{
 			gint i = 0;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			i = 0;
-#line 3870 "PicasaPublishing.c"
+#line 3866 "PicasaPublishing.c"
 			{
 				gboolean _tmp17_ = FALSE;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp17_ = TRUE;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				while (TRUE) {
-#line 3877 "PicasaPublishing.c"
+#line 3873 "PicasaPublishing.c"
 					gint _tmp19_;
 					gchar** _tmp20_;
 					gint _tmp20__length1;
@@ -3900,19 +3896,18 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 					gint _tmp21__length1;
 					gint _tmp22_;
 					const gchar* _tmp23_;
-					gboolean _tmp24_;
-					const gchar* _tmp37_;
+					const gchar* _tmp36_;
+					gint _tmp37_;
 					gint _tmp38_;
-					gint _tmp39_;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					if (!_tmp17_) {
-#line 3894 "PicasaPublishing.c"
+#line 3889 "PicasaPublishing.c"
 						gint _tmp18_;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp18_ = i;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						i = _tmp18_ + 1;
-#line 3900 "PicasaPublishing.c"
+#line 3895 "PicasaPublishing.c"
 					}
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp17_ = FALSE;
@@ -3926,7 +3921,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 					if (!(_tmp19_ < _tmp20__length1)) {
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						break;
-#line 3914 "PicasaPublishing.c"
+#line 3909 "PicasaPublishing.c"
 					}
 #line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp21_ = keywords;
@@ -3937,222 +3932,220 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 #line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp23_ = _tmp21_[_tmp22_];
 #line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp24_ = g_str_has_prefix (_tmp23_, "/");
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					if (_tmp24_) {
-#line 3928 "PicasaPublishing.c"
-						gchar** _tmp25_;
-						gint _tmp25__length1;
-						gint _tmp26_;
-						const gchar* _tmp27_;
+					if (g_str_has_prefix (_tmp23_, "/")) {
+#line 3921 "PicasaPublishing.c"
+						gchar** _tmp24_;
+						gint _tmp24__length1;
+						gint _tmp25_;
+						const gchar* _tmp26_;
+						gchar* _tmp27_;
 						gchar* _tmp28_;
-						gchar* _tmp29_;
+						gchar** _tmp29_;
 						gchar** _tmp30_;
-						gchar** _tmp31_;
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp25_ = keywords;
+						_tmp24_ = keywords;
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp25__length1 = keywords_length1;
+						_tmp24__length1 = keywords_length1;
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp26_ = i;
+						_tmp25_ = i;
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp27_ = _tmp25_[_tmp26_];
+						_tmp26_ = _tmp24_[_tmp25_];
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp28_ = string_substring (_tmp27_, (glong) 1, (glong) -1);
+						_tmp27_ = string_substring (_tmp26_, (glong) 1, (glong) -1);
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp29_ = _tmp28_;
+						_tmp28_ = _tmp27_;
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp31_ = _tmp30_ = g_strsplit (_tmp29_, "/", 0);
+						_tmp30_ = _tmp29_ = g_strsplit (_tmp28_, "/", 0);
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						tmp = (_vala_array_free (tmp, tmp_length1, (GDestroyNotify) g_free), NULL);
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						tmp = _tmp31_;
+						tmp = _tmp30_;
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						tmp_length1 = _vala_array_length (_tmp30_);
+						tmp_length1 = _vala_array_length (_tmp29_);
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp_size_ = tmp_length1;
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_g_free0 (_tmp29_);
-#line 3961 "PicasaPublishing.c"
+						_g_free0 (_tmp28_);
+#line 3954 "PicasaPublishing.c"
 					} else {
-						gchar** _tmp32_;
-						gint _tmp32__length1;
-						gint _tmp33_;
-						const gchar* _tmp34_;
+						gchar** _tmp31_;
+						gint _tmp31__length1;
+						gint _tmp32_;
+						const gchar* _tmp33_;
+						gchar** _tmp34_;
 						gchar** _tmp35_;
-						gchar** _tmp36_;
 #line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp32_ = keywords;
+						_tmp31_ = keywords;
 #line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp32__length1 = keywords_length1;
+						_tmp31__length1 = keywords_length1;
 #line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp33_ = i;
+						_tmp32_ = i;
 #line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp34_ = _tmp32_[_tmp33_];
+						_tmp33_ = _tmp31_[_tmp32_];
 #line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp36_ = _tmp35_ = g_strsplit (_tmp34_, "/", 0);
+						_tmp35_ = _tmp34_ = g_strsplit (_tmp33_, "/", 0);
 #line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						tmp = (_vala_array_free (tmp, tmp_length1, (GDestroyNotify) g_free), NULL);
 #line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						tmp = _tmp36_;
+						tmp = _tmp35_;
 #line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						tmp_length1 = _vala_array_length (_tmp35_);
+						tmp_length1 = _vala_array_length (_tmp34_);
 #line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp_size_ = tmp_length1;
-#line 3987 "PicasaPublishing.c"
+#line 3980 "PicasaPublishing.c"
 					}
 #line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp37_ = keywords_string;
+					_tmp36_ = keywords_string;
 #line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp38_ = strlen (_tmp37_);
+					_tmp37_ = strlen (_tmp36_);
 #line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp39_ = _tmp38_;
+					_tmp38_ = _tmp37_;
 #line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					if (_tmp39_ > 0) {
-#line 3997 "PicasaPublishing.c"
-						const gchar* _tmp40_;
-						gchar** _tmp41_;
-						gint _tmp41__length1;
+					if (_tmp38_ > 0) {
+#line 3990 "PicasaPublishing.c"
+						const gchar* _tmp39_;
+						gchar** _tmp40_;
+						gint _tmp40__length1;
+						gchar* _tmp41_;
 						gchar* _tmp42_;
 						gchar* _tmp43_;
-						gchar* _tmp44_;
 #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp40_ = keywords_string;
+						_tmp39_ = keywords_string;
 #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp41_ = tmp;
+						_tmp40_ = tmp;
 #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp41__length1 = tmp_length1;
+						_tmp40__length1 = tmp_length1;
 #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp42_ = _vala_g_strjoinv (", ", _tmp41_, _tmp41__length1);
+						_tmp41_ = _vala_g_strjoinv (", ", _tmp40_, _tmp40__length1);
 #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp43_ = _tmp42_;
+						_tmp42_ = _tmp41_;
 #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp44_ = g_strjoin (", ", _tmp40_, _tmp43_, NULL);
+						_tmp43_ = g_strjoin (", ", _tmp39_, _tmp42_, NULL);
 #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_g_free0 (keywords_string);
 #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						keywords_string = _tmp44_;
+						keywords_string = _tmp43_;
 #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_g_free0 (_tmp43_);
-#line 4022 "PicasaPublishing.c"
+						_g_free0 (_tmp42_);
+#line 4015 "PicasaPublishing.c"
 					} else {
-						gchar** _tmp45_;
-						gint _tmp45__length1;
-						gchar* _tmp46_;
+						gchar** _tmp44_;
+						gint _tmp44__length1;
+						gchar* _tmp45_;
 #line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp45_ = tmp;
+						_tmp44_ = tmp;
 #line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp45__length1 = tmp_length1;
+						_tmp44__length1 = tmp_length1;
 #line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp46_ = _vala_g_strjoinv (", ", _tmp45_, _tmp45__length1);
+						_tmp45_ = _vala_g_strjoinv (", ", _tmp44_, _tmp44__length1);
 #line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_g_free0 (keywords_string);
 #line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						keywords_string = _tmp46_;
-#line 4037 "PicasaPublishing.c"
+						keywords_string = _tmp45_;
+#line 4030 "PicasaPublishing.c"
 					}
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					tmp = (_vala_array_free (tmp, tmp_length1, (GDestroyNotify) g_free), NULL);
-#line 4041 "PicasaPublishing.c"
+#line 4034 "PicasaPublishing.c"
 				}
 			}
 		}
 #line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp47_ = keywords_string;
+		_tmp46_ = keywords_string;
 #line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp48_ = publishing_rest_support_decimal_entity_encode (_tmp47_);
+		_tmp47_ = publishing_rest_support_decimal_entity_encode (_tmp46_);
 #line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_free0 (keywords_string);
 #line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		keywords_string = _tmp48_;
+		keywords_string = _tmp47_;
 #line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp49_ = keywords_string;
+		_tmp48_ = keywords_string;
 #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_);
+		_tmp49_ = g_strdup_printf ("<mrss:group><mrss:keywords>%s</mrss:keywords></mrss:group>", _tmp48_);
 #line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_free0 (keywords_string);
 #line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		keywords_string = _tmp50_;
-#line 4061 "PicasaPublishing.c"
+		keywords_string = _tmp49_;
+#line 4054 "PicasaPublishing.c"
 	}
 #line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp51_ = self->priv->publishable;
+	_tmp50_ = self->priv->publishable;
 #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);
+	_tmp51_ = spit_publishing_publishable_get_param_string (_tmp50_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
 #line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp53_ = _tmp52_;
+	_tmp52_ = _tmp51_;
 #line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp54_ = publishing_rest_support_decimal_entity_encode (_tmp53_);
+	_tmp53_ = publishing_rest_support_decimal_entity_encode (_tmp52_);
 #line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp55_ = _tmp54_;
+	_tmp54_ = _tmp53_;
 #line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp56_ = summary;
+	_tmp55_ = summary;
 #line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp57_ = keywords_string;
+	_tmp56_ = keywords_string;
 #line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp58_ = g_strdup_printf (PUBLISHING_PICASA_UPLOAD_TRANSACTION_METADATA_TEMPLATE, _tmp55_, _tmp56_, _tmp57_);
+	_tmp57_ = g_strdup_printf (PUBLISHING_PICASA_UPLOAD_TRANSACTION_METADATA_TEMPLATE, _tmp54_, _tmp55_, _tmp56_);
 #line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp59_ = _tmp58_;
+	_tmp58_ = _tmp57_;
 #line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (_tmp55_);
+	_g_free0 (_tmp54_);
 #line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (_tmp53_);
+	_g_free0 (_tmp52_);
 #line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	metadata = _tmp59_;
+	metadata = _tmp58_;
 #line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp60_ = metadata;
+	_tmp59_ = metadata;
 #line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp61_ = string_get_data (_tmp60_, &_tmp61__length1);
+	_tmp60_ = string_get_data (_tmp59_, &_tmp60__length1);
 #line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp62_ = _tmp61_;
+	_tmp61_ = _tmp60_;
 #line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp62__length1 = _tmp61__length1;
+	_tmp61__length1 = _tmp60__length1;
 #line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp63_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp62_, _tmp62__length1);
+	_tmp62_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp61_, _tmp61__length1);
 #line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	metadata_buffer = _tmp63_;
+	metadata_buffer = _tmp62_;
 #line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp64_ = message_parts;
+	_tmp63_ = message_parts;
 #line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp65_ = metadata_buffer;
+	_tmp64_ = metadata_buffer;
 #line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	soup_multipart_append_form_file (_tmp64_, "", "", "application/atom+xml", _tmp65_);
-#line 4105 "PicasaPublishing.c"
+	soup_multipart_append_form_file (_tmp63_, "", "", "application/atom+xml", _tmp64_);
+#line 4098 "PicasaPublishing.c"
 	{
-		GMappedFile* _tmp66_ = NULL;
-		SpitPublishingPublishable* _tmp67_;
+		GMappedFile* _tmp65_ = NULL;
+		SpitPublishingPublishable* _tmp66_;
+		GFile* _tmp67_;
 		GFile* _tmp68_;
-		GFile* _tmp69_;
+		gchar* _tmp69_;
 		gchar* _tmp70_;
-		gchar* _tmp71_;
+		GMappedFile* _tmp71_;
 		GMappedFile* _tmp72_;
 		GMappedFile* _tmp73_;
-		GMappedFile* _tmp74_;
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp67_ = self->priv->publishable;
+		_tmp66_ = self->priv->publishable;
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp68_ = spit_publishing_publishable_get_serialized_file (_tmp67_);
+		_tmp67_ = spit_publishing_publishable_get_serialized_file (_tmp66_);
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp69_ = _tmp68_;
+		_tmp68_ = _tmp67_;
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp70_ = g_file_get_path (_tmp69_);
+		_tmp69_ = g_file_get_path (_tmp68_);
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp71_ = _tmp70_;
+		_tmp70_ = _tmp69_;
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp72_ = g_mapped_file_new (_tmp71_, FALSE, &_inner_error_);
+		_tmp71_ = g_mapped_file_new (_tmp70_, FALSE, &_inner_error_);
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp73_ = _tmp72_;
+		_tmp72_ = _tmp71_;
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_g_free0 (_tmp71_);
+		_g_free0 (_tmp70_);
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_g_object_unref0 (_tmp69_);
+		_g_object_unref0 (_tmp68_);
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp66_ = _tmp73_;
+		_tmp65_ = _tmp72_;
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			if (_inner_error_->domain == G_FILE_ERROR) {
-#line 4140 "PicasaPublishing.c"
+#line 4133 "PicasaPublishing.c"
 				goto __catch11_g_file_error;
 			}
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -4173,80 +4166,80 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 			g_clear_error (&_inner_error_);
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return;
-#line 4161 "PicasaPublishing.c"
+#line 4154 "PicasaPublishing.c"
 		}
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp74_ = _tmp66_;
+		_tmp73_ = _tmp65_;
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp66_ = NULL;
+		_tmp65_ = NULL;
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_mapped_file_unref0 (self->priv->mapped_file);
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		self->priv->mapped_file = _tmp74_;
+		self->priv->mapped_file = _tmp73_;
 #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_g_mapped_file_unref0 (_tmp66_);
-#line 4173 "PicasaPublishing.c"
+		_g_mapped_file_unref0 (_tmp65_);
+#line 4166 "PicasaPublishing.c"
 	}
 	goto __finally11;
 	__catch11_g_file_error:
 	{
 		GError* e = NULL;
 		gchar* msg = NULL;
-		SpitPublishingPublishable* _tmp75_;
+		SpitPublishingPublishable* _tmp74_;
+		GFile* _tmp75_;
 		GFile* _tmp76_;
-		GFile* _tmp77_;
+		gchar* _tmp77_;
 		gchar* _tmp78_;
-		gchar* _tmp79_;
-		GError* _tmp80_;
-		const gchar* _tmp81_;
+		GError* _tmp79_;
+		const gchar* _tmp80_;
+		gchar* _tmp81_;
 		gchar* _tmp82_;
-		gchar* _tmp83_;
+		const gchar* _tmp83_;
 		const gchar* _tmp84_;
-		const gchar* _tmp85_;
-		GError* _tmp86_;
+		GError* _tmp85_;
 #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		e = _inner_error_;
 #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_inner_error_ = NULL;
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp75_ = self->priv->publishable;
+		_tmp74_ = self->priv->publishable;
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp76_ = spit_publishing_publishable_get_serialized_file (_tmp75_);
+		_tmp75_ = spit_publishing_publishable_get_serialized_file (_tmp74_);
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp77_ = _tmp76_;
+		_tmp76_ = _tmp75_;
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp78_ = g_file_get_path (_tmp77_);
+		_tmp77_ = g_file_get_path (_tmp76_);
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp79_ = _tmp78_;
+		_tmp78_ = _tmp77_;
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp80_ = e;
+		_tmp79_ = e;
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp81_ = _tmp80_->message;
+		_tmp80_ = _tmp79_->message;
 #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_);
+		_tmp81_ = g_strdup_printf ("Picasa: couldn't read data from %s: %s", _tmp78_, _tmp80_);
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp83_ = _tmp82_;
+		_tmp82_ = _tmp81_;
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_g_free0 (_tmp79_);
+		_g_free0 (_tmp78_);
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_g_object_unref0 (_tmp77_);
+		_g_object_unref0 (_tmp76_);
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		msg = _tmp83_;
+		msg = _tmp82_;
 #line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp84_ = msg;
+		_tmp83_ = msg;
 #line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		g_warning ("PicasaPublishing.vala:477: %s", _tmp84_);
+		g_warning ("PicasaPublishing.vala:477: %s", _tmp83_);
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp85_ = msg;
+		_tmp84_ = msg;
 #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_);
+		_tmp85_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp84_);
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_inner_error_ = _tmp86_;
+		_inner_error_ = _tmp85_;
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_free0 (msg);
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_error_free0 (e);
-#line 4234 "PicasaPublishing.c"
+#line 4227 "PicasaPublishing.c"
 		goto __finally11;
 	}
 	__finally11:
@@ -4270,7 +4263,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 			__vala_SoupMultipart_free0 (message_parts);
 #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return;
-#line 4258 "PicasaPublishing.c"
+#line 4251 "PicasaPublishing.c"
 		} else {
 #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			__vala_SoupBuffer_free0 (metadata_buffer);
@@ -4290,83 +4283,81 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 			g_clear_error (&_inner_error_);
 #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return;
-#line 4278 "PicasaPublishing.c"
+#line 4271 "PicasaPublishing.c"
 		}
 	}
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp87_ = self->priv->mapped_file;
+	_tmp86_ = self->priv->mapped_file;
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp88_ = g_mapped_file_get_contents (_tmp87_);
+	_tmp87_ = g_mapped_file_get_contents (_tmp86_);
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	photo_data = (guint8*) _tmp88_;
+	photo_data = (guint8*) _tmp87_;
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	photo_data_length1 = sizeof (gchar) / sizeof (guint8);
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_photo_data_size_ = photo_data_length1;
 #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp89_ = self->priv->mapped_file;
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp90_ = g_mapped_file_get_length (_tmp89_);
+	_tmp88_ = self->priv->mapped_file;
 #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	photo_data_length1 = (gint) _tmp90_;
+	photo_data_length1 = (gint) g_mapped_file_get_length (_tmp88_);
 #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp91_ = photo_data_length1;
+	_tmp89_ = photo_data_length1;
 #line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp92_ = soup_buffer_new (SOUP_MEMORY_TEMPORARY, photo_data, photo_data_length1);
+	_tmp90_ = soup_buffer_new (SOUP_MEMORY_TEMPORARY, photo_data, photo_data_length1);
 #line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	bindable_data = _tmp92_;
+	bindable_data = _tmp90_;
 #line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp93_ = message_parts;
+	_tmp91_ = message_parts;
 #line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp94_ = self->priv->publishable;
+	_tmp92_ = self->priv->publishable;
 #line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp95_ = spit_publishing_publishable_get_serialized_file (_tmp94_);
+	_tmp93_ = spit_publishing_publishable_get_serialized_file (_tmp92_);
 #line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp96_ = _tmp95_;
+	_tmp94_ = _tmp93_;
 #line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp97_ = g_file_get_path (_tmp96_);
+	_tmp95_ = g_file_get_path (_tmp94_);
 #line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp98_ = _tmp97_;
+	_tmp96_ = _tmp95_;
 #line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp99_ = self->priv->mime_type;
+	_tmp97_ = self->priv->mime_type;
 #line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	soup_multipart_append_form_file (_tmp93_, "", _tmp98_, _tmp99_, bindable_data);
+	soup_multipart_append_form_file (_tmp91_, "", _tmp96_, _tmp97_, bindable_data);
 #line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (_tmp98_);
+	_g_free0 (_tmp96_);
 #line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_object_unref0 (_tmp96_);
+	_g_object_unref0 (_tmp94_);
 #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));
+	_tmp98_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
 #line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp101_ = _tmp100_;
+	_tmp99_ = _tmp98_;
 #line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp102_ = message_parts;
+	_tmp100_ = message_parts;
 #line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp103_ = soup_form_request_new_from_multipart (_tmp101_, _tmp102_);
+	_tmp101_ = soup_form_request_new_from_multipart (_tmp99_, _tmp100_);
 #line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp104_ = _tmp103_;
+	_tmp102_ = _tmp101_;
 #line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (_tmp101_);
+	_g_free0 (_tmp99_);
 #line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	outbound_message = _tmp104_;
+	outbound_message = _tmp102_;
 #line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp105_ = outbound_message->request_headers;
+	_tmp103_ = outbound_message->request_headers;
 #line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp106_ = self->priv->session;
+	_tmp104_ = self->priv->session;
 #line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp107_ = publishing_rest_support_google_session_get_access_token (_tmp106_);
+	_tmp105_ = publishing_rest_support_google_session_get_access_token (_tmp104_);
 #line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp108_ = _tmp107_;
+	_tmp106_ = _tmp105_;
 #line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp109_ = g_strconcat ("Bearer ", _tmp108_, NULL);
+	_tmp107_ = g_strconcat ("Bearer ", _tmp106_, NULL);
 #line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp110_ = _tmp109_;
-#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	soup_message_headers_append (_tmp105_, "Authorization", _tmp110_);
+	_tmp108_ = _tmp107_;
 #line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (_tmp110_);
+	soup_message_headers_append (_tmp103_, "Authorization", _tmp108_);
 #line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (_tmp108_);
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_g_free0 (_tmp106_);
 #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 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -4397,7 +4388,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 			__vala_SoupMultipart_free0 (message_parts);
 #line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return;
-#line 4385 "PicasaPublishing.c"
+#line 4376 "PicasaPublishing.c"
 		} else {
 #line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_object_unref0 (outbound_message);
@@ -4421,7 +4412,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 			g_clear_error (&_inner_error_);
 #line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return;
-#line 4409 "PicasaPublishing.c"
+#line 4400 "PicasaPublishing.c"
 		}
 	}
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -4440,11 +4431,13 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 	_g_free0 (summary);
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	__vala_SoupMultipart_free0 (message_parts);
-#line 4428 "PicasaPublishing.c"
+#line 4419 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_upload_transaction_class_init (PublishingPicasaUploadTransactionClass * klass) {
+static void
+publishing_picasa_upload_transaction_class_init (PublishingPicasaUploadTransactionClass * klass)
+{
 #line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_upload_transaction_parent_class = g_type_class_peek_parent (klass);
 #line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -4453,18 +4446,22 @@ static void publishing_picasa_upload_transaction_class_init (PublishingPicasaUpl
 	g_type_class_add_private (klass, sizeof (PublishingPicasaUploadTransactionPrivate));
 #line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_picasa_upload_transaction_real_execute;
-#line 4441 "PicasaPublishing.c"
+#line 4434 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_upload_transaction_instance_init (PublishingPicasaUploadTransaction * self) {
+static void
+publishing_picasa_upload_transaction_instance_init (PublishingPicasaUploadTransaction * self)
+{
 #line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv = PUBLISHING_PICASA_UPLOAD_TRANSACTION_GET_PRIVATE (self);
-#line 4448 "PicasaPublishing.c"
+#line 4443 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_upload_transaction_finalize (PublishingRESTSupportTransaction * obj) {
+static void
+publishing_picasa_upload_transaction_finalize (PublishingRESTSupportTransaction * obj)
+{
 	PublishingPicasaUploadTransaction * self;
 #line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PICASA_TYPE_UPLOAD_TRANSACTION, PublishingPicasaUploadTransaction);
@@ -4480,11 +4477,13 @@ static void publishing_picasa_upload_transaction_finalize (PublishingRESTSupport
 	_g_mapped_file_unref0 (self->priv->mapped_file);
 #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 4468 "PicasaPublishing.c"
+#line 4465 "PicasaPublishing.c"
 }
 
 
-GType publishing_picasa_upload_transaction_get_type (void) {
+GType
+publishing_picasa_upload_transaction_get_type (void)
+{
 	static volatile gsize publishing_picasa_upload_transaction_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_picasa_upload_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingPicasaUploadTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_picasa_upload_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPicasaUploadTransaction), 0, (GInstanceInitFunc) publishing_picasa_upload_transaction_instance_init, NULL };
@@ -4496,81 +4495,75 @@ GType publishing_picasa_upload_transaction_get_type (void) {
 }
 
 
-static gpointer _publishing_picasa_publishing_options_pane_size_description_ref0 (gpointer self) {
+static gpointer
+_publishing_picasa_publishing_options_pane_size_description_ref0 (gpointer self)
+{
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self ? publishing_picasa_publishing_options_pane_size_description_ref (self) : NULL;
-#line 4487 "PicasaPublishing.c"
+#line 4488 "PicasaPublishing.c"
 }
 
 
-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_logout_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                 gpointer self)
+{
 #line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_publishing_options_pane_on_logout_clicked ((PublishingPicasaPublishingOptionsPane*) self);
-#line 4494 "PicasaPublishing.c"
+#line 4498 "PicasaPublishing.c"
 }
 
 
-static void _publishing_picasa_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_picasa_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                  gpointer self)
+{
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_publishing_options_pane_on_publish_clicked ((PublishingPicasaPublishingOptionsPane*) self);
-#line 4501 "PicasaPublishing.c"
+#line 4508 "PicasaPublishing.c"
 }
 
 
-PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane_construct (GType object_type, GtkBuilder* builder, PublishingPicasaPublishingParameters* parameters, gboolean can_logout) {
+PublishingPicasaPublishingOptionsPane*
+publishing_picasa_publishing_options_pane_construct (GType object_type,
+                                                     GtkBuilder* builder,
+                                                     PublishingPicasaPublishingParameters* parameters,
+                                                     gboolean can_logout)
+{
 	PublishingPicasaPublishingOptionsPane * self = NULL;
 	gint _tmp0_;
 	PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp1_;
 	GtkBuilder* _tmp2_;
-	GtkBuilder* _tmp3_;
-	GtkBuilder* _tmp4_;
-	GtkBuilder* _tmp5_;
-	GSList* _tmp6_;
-	GSList* _tmp7_;
-	guint _tmp8_;
-	PublishingPicasaPublishingParameters* _tmp9_;
-	PublishingPicasaPublishingParameters* _tmp10_;
-	GtkBuilder* _tmp11_;
+	GSList* _tmp3_;
+	GSList* _tmp4_;
+	PublishingPicasaPublishingParameters* _tmp5_;
+	GObject* _tmp6_;
+	GtkBox* _tmp7_;
+	GObject* _tmp8_;
+	GtkLabel* _tmp9_;
+	GObject* _tmp10_;
+	GtkLabel* _tmp11_;
 	GObject* _tmp12_;
-	GtkBox* _tmp13_;
-	GtkBuilder* _tmp14_;
-	GObject* _tmp15_;
-	GtkLabel* _tmp16_;
-	GtkBuilder* _tmp17_;
-	GObject* _tmp18_;
-	GtkLabel* _tmp19_;
-	GtkBuilder* _tmp20_;
+	GtkComboBoxText* _tmp13_;
+	GObject* _tmp14_;
+	GtkCheckButton* _tmp15_;
+	GObject* _tmp16_;
+	GtkComboBoxText* _tmp17_;
+	GtkBuilder* _tmp18_;
+	GObject* _tmp19_;
+	GtkCheckButton* _tmp20_;
 	GObject* _tmp21_;
-	GtkComboBoxText* _tmp22_;
-	GtkBuilder* _tmp23_;
-	GObject* _tmp24_;
-	GtkCheckButton* _tmp25_;
-	GtkBuilder* _tmp26_;
-	GObject* _tmp27_;
-	GtkComboBoxText* _tmp28_;
-	GtkBuilder* _tmp29_;
-	GObject* _tmp30_;
-	GtkCheckButton* _tmp31_;
-	GtkBuilder* _tmp32_;
-	GObject* _tmp33_;
-	GtkButton* _tmp34_;
-	GtkBuilder* _tmp35_;
-	GObject* _tmp36_;
-	GtkButton* _tmp37_;
-	gboolean _tmp38_;
-	GtkLabel* _tmp43_;
-	PublishingPicasaPublishingParameters* _tmp44_;
-	gchar* _tmp45_;
-	gchar* _tmp46_;
-	gchar* _tmp47_;
-	gchar* _tmp48_;
-	GtkCheckButton* _tmp49_;
-	PublishingPicasaPublishingParameters* _tmp50_;
-	gboolean _tmp51_;
-	PublishingPicasaPublishingParameters* _tmp52_;
-	SpitPublishingPublisherMediaType _tmp53_;
-	GtkButton* _tmp68_;
-	GtkButton* _tmp69_;
+	GtkButton* _tmp22_;
+	GObject* _tmp23_;
+	GtkButton* _tmp24_;
+	GtkLabel* _tmp29_;
+	gchar* _tmp30_;
+	gchar* _tmp31_;
+	gchar* _tmp32_;
+	gchar* _tmp33_;
+	GtkCheckButton* _tmp34_;
+	GtkButton* _tmp47_;
+	GtkButton* _tmp48_;
 #line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (GTK_IS_BUILDER (builder), NULL);
 #line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -4588,507 +4581,484 @@ PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane
 #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->_size_descriptions_size_ = self->priv->size_descriptions_length1;
 #line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp2_ = builder;
-#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp3_ = _g_object_ref0 (_tmp2_);
+	_tmp2_ = _g_object_ref0 (builder);
 #line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->builder);
 #line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->builder = _tmp3_;
-#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp4_ = builder;
+	self->priv->builder = _tmp2_;
 #line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_vala_assert (_tmp4_ != NULL, "builder != null");
-#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp5_ = builder;
-#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp6_ = gtk_builder_get_objects (_tmp5_);
+	_vala_assert (builder != NULL, "builder != null");
 #line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp7_ = _tmp6_;
+	_tmp3_ = gtk_builder_get_objects (builder);
 #line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp8_ = g_slist_length (_tmp7_);
+	_tmp4_ = _tmp3_;
 #line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_vala_assert (_tmp8_ > ((guint) 0), "builder.get_objects().length() > 0");
+	_vala_assert (g_slist_length (_tmp4_) > ((guint) 0), "builder.get_objects().length() > 0");
 #line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_slist_free0 (_tmp7_);
-#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp9_ = parameters;
+	_g_slist_free0 (_tmp4_);
 #line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp10_ = _publishing_picasa_publishing_parameters_ref0 (_tmp9_);
+	_tmp5_ = _publishing_picasa_publishing_parameters_ref0 (parameters);
 #line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_picasa_publishing_parameters_unref0 (self->priv->parameters);
 #line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->parameters = _tmp10_;
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp11_ = builder;
+	self->priv->parameters = _tmp5_;
 #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp12_ = gtk_builder_get_object (_tmp11_, "picasa_pane_widget");
+	_tmp6_ = gtk_builder_get_object (builder, "picasa_pane_widget");
 #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));
+	_tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_box_get_type (), GtkBox));
 #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->pane_widget);
 #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->pane_widget = _tmp13_;
+	self->priv->pane_widget = _tmp7_;
 #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp14_ = builder;
+	_tmp8_ = gtk_builder_get_object (builder, "login_identity_label");
 #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp15_ = gtk_builder_get_object (_tmp14_, "login_identity_label");
-#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));
+	_tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_label_get_type (), GtkLabel));
 #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->login_identity_label);
 #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->login_identity_label = _tmp16_;
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp17_ = builder;
+	self->priv->login_identity_label = _tmp9_;
 #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp18_ = gtk_builder_get_object (_tmp17_, "publish_to_label");
+	_tmp10_ = gtk_builder_get_object (builder, "publish_to_label");
 #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));
+	_tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_label_get_type (), GtkLabel));
 #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->publish_to_label);
 #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->publish_to_label = _tmp19_;
-#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp20_ = builder;
+	self->priv->publish_to_label = _tmp11_;
 #line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp21_ = gtk_builder_get_object (_tmp20_, "existing_albums_combo");
+	_tmp12_ = gtk_builder_get_object (builder, "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));
+	_tmp13_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, 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 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->existing_albums_combo = _tmp22_;
+	self->priv->existing_albums_combo = _tmp13_;
 #line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp23_ = builder;
+	_tmp14_ = gtk_builder_get_object (builder, "public_check");
 #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));
+	_tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, 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 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;
+	self->priv->public_check = _tmp15_;
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp27_ = gtk_builder_get_object (_tmp26_, "size_combo");
+	_tmp16_ = gtk_builder_get_object (builder, "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));
+	_tmp17_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, 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 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->size_combo = _tmp28_;
+	self->priv->size_combo = _tmp17_;
 #line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp29_ = self->priv->builder;
+	_tmp18_ = self->priv->builder;
 #line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp30_ = gtk_builder_get_object (_tmp29_, "strip_metadata_check");
+	_tmp19_ = gtk_builder_get_object (_tmp18_, "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));
+	_tmp20_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, 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 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;
+	self->priv->strip_metadata_check = _tmp20_;
 #line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp33_ = gtk_builder_get_object (_tmp32_, "publish_button");
+	_tmp21_ = gtk_builder_get_object (builder, "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));
+	_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_button_get_type (), GtkButton));
 #line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->publish_button);
 #line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->publish_button = _tmp34_;
+	self->priv->publish_button = _tmp22_;
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp35_ = builder;
+	_tmp23_ = gtk_builder_get_object (builder, "logout_button");
 #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));
+	_tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_button_get_type (), GtkButton));
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->logout_button);
 #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;
+	self->priv->logout_button = _tmp24_;
 #line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (!_tmp38_) {
-#line 4701 "PicasaPublishing.c"
-		GtkButton* _tmp39_;
-		GtkContainer* _tmp40_;
-		GtkContainer* _tmp41_;
-		GtkButton* _tmp42_;
+	if (!can_logout) {
+#line 4666 "PicasaPublishing.c"
+		GtkButton* _tmp25_;
+		GtkContainer* _tmp26_;
+		GtkContainer* _tmp27_;
+		GtkButton* _tmp28_;
 #line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp39_ = self->priv->logout_button;
+		_tmp25_ = 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));
+		_tmp26_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget));
 #line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp41_ = _tmp40_;
+		_tmp27_ = _tmp26_;
 #line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp42_ = self->priv->logout_button;
+		_tmp28_ = 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 4716 "PicasaPublishing.c"
+		gtk_container_remove (_tmp27_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget));
+#line 4681 "PicasaPublishing.c"
 	}
 #line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp43_ = self->priv->login_identity_label;
+	_tmp29_ = self->priv->login_identity_label;
 #line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp44_ = parameters;
+	_tmp30_ = publishing_picasa_publishing_parameters_get_user_name (parameters);
 #line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp45_ = publishing_picasa_publishing_parameters_get_user_name (_tmp44_);
+	_tmp31_ = _tmp30_;
 #line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp46_ = _tmp45_;
+	_tmp32_ = g_strdup_printf (_ ("You are logged into Picasa Web Albums as %s."), _tmp31_);
 #line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp47_ = g_strdup_printf (_ ("You are logged into Picasa Web Albums as %s."), _tmp46_);
+	_tmp33_ = _tmp32_;
 #line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp48_ = _tmp47_;
+	gtk_label_set_label (_tmp29_, _tmp33_);
 #line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	gtk_label_set_label (_tmp43_, _tmp48_);
+	_g_free0 (_tmp33_);
 #line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (_tmp48_);
-#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (_tmp46_);
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp49_ = self->priv->strip_metadata_check;
+	_g_free0 (_tmp31_);
 #line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp50_ = parameters;
+	_tmp34_ = self->priv->strip_metadata_check;
 #line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp51_ = publishing_picasa_publishing_parameters_get_strip_metadata (_tmp50_);
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp51_);
-#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp52_ = parameters;
-#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp53_ = publishing_picasa_publishing_parameters_get_media_type (_tmp52_);
+	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_toggle_button_get_type (), GtkToggleButton), publishing_picasa_publishing_parameters_get_strip_metadata (parameters));
 #line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if ((_tmp53_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) == 0) {
-#line 4750 "PicasaPublishing.c"
-		GtkLabel* _tmp54_;
-		GtkComboBoxText* _tmp55_;
-		GtkComboBoxText* _tmp56_;
+	if ((publishing_picasa_publishing_parameters_get_media_type (parameters) & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) == 0) {
+#line 4705 "PicasaPublishing.c"
+		GtkLabel* _tmp35_;
+		GtkComboBoxText* _tmp36_;
+		GtkComboBoxText* _tmp37_;
 #line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp54_ = self->priv->publish_to_label;
+		_tmp35_ = self->priv->publish_to_label;
 #line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		gtk_label_set_label (_tmp54_, _ ("Videos will appear in:"));
+		gtk_label_set_label (_tmp35_, _ ("Videos will appear in:"));
 #line 567 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp55_ = self->priv->size_combo;
+		_tmp36_ = self->priv->size_combo;
 #line 567 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_widget_get_type (), GtkWidget), FALSE);
+		gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp56_ = self->priv->size_combo;
+		_tmp37_ = self->priv->size_combo;
 #line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 4766 "PicasaPublishing.c"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 4721 "PicasaPublishing.c"
 	} else {
-		GtkLabel* _tmp57_;
-		PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp58_;
-		gint _tmp58__length1;
-		GtkComboBoxText* _tmp63_;
-		GtkComboBoxText* _tmp64_;
-		GtkComboBoxText* _tmp65_;
-		PublishingPicasaPublishingParameters* _tmp66_;
-		gint _tmp67_;
+		GtkLabel* _tmp38_;
+		PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp39_;
+		gint _tmp39__length1;
+		GtkComboBoxText* _tmp44_;
+		GtkComboBoxText* _tmp45_;
+		GtkComboBoxText* _tmp46_;
 #line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp57_ = self->priv->publish_to_label;
+		_tmp38_ = self->priv->publish_to_label;
 #line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		gtk_label_set_label (_tmp57_, _ ("Photos will appear in:"));
+		gtk_label_set_label (_tmp38_, _ ("Photos will appear in:"));
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp58_ = self->priv->size_descriptions;
+		_tmp39_ = self->priv->size_descriptions;
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp58__length1 = self->priv->size_descriptions_length1;
-#line 4784 "PicasaPublishing.c"
+		_tmp39__length1 = self->priv->size_descriptions_length1;
+#line 4737 "PicasaPublishing.c"
 		{
 			PublishingPicasaPublishingOptionsPaneSizeDescription** desc_collection = NULL;
 			gint desc_collection_length1 = 0;
 			gint _desc_collection_size_ = 0;
 			gint desc_it = 0;
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			desc_collection = _tmp58_;
+			desc_collection = _tmp39_;
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			desc_collection_length1 = _tmp58__length1;
+			desc_collection_length1 = _tmp39__length1;
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			for (desc_it = 0; desc_it < _tmp58__length1; desc_it = desc_it + 1) {
-#line 4796 "PicasaPublishing.c"
-				PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp59_;
+			for (desc_it = 0; desc_it < _tmp39__length1; desc_it = desc_it + 1) {
+#line 4749 "PicasaPublishing.c"
+				PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp40_;
 				PublishingPicasaPublishingOptionsPaneSizeDescription* desc = NULL;
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-				_tmp59_ = _publishing_picasa_publishing_options_pane_size_description_ref0 (desc_collection[desc_it]);
+				_tmp40_ = _publishing_picasa_publishing_options_pane_size_description_ref0 (desc_collection[desc_it]);
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-				desc = _tmp59_;
-#line 4803 "PicasaPublishing.c"
+				desc = _tmp40_;
+#line 4756 "PicasaPublishing.c"
 				{
-					GtkComboBoxText* _tmp60_;
-					PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp61_;
-					const gchar* _tmp62_;
+					GtkComboBoxText* _tmp41_;
+					PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp42_;
+					const gchar* _tmp43_;
 #line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp60_ = self->priv->size_combo;
+					_tmp41_ = self->priv->size_combo;
 #line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp61_ = desc;
+					_tmp42_ = desc;
 #line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp62_ = _tmp61_->name;
+					_tmp43_ = _tmp42_->name;
 #line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					gtk_combo_box_text_append_text (_tmp60_, _tmp62_);
+					gtk_combo_box_text_append_text (_tmp41_, _tmp43_);
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_publishing_picasa_publishing_options_pane_size_description_unref0 (desc);
-#line 4818 "PicasaPublishing.c"
+#line 4771 "PicasaPublishing.c"
 				}
 			}
 		}
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp63_ = self->priv->size_combo;
+		_tmp44_ = self->priv->size_combo;
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_widget_get_type (), GtkWidget), TRUE);
+		gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp64_ = self->priv->size_combo;
+		_tmp45_ = self->priv->size_combo;
 #line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget), TRUE);
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp65_ = self->priv->size_combo;
+		_tmp46_ = self->priv->size_combo;
 #line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp66_ = parameters;
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp67_ = publishing_picasa_publishing_parameters_get_major_axis_size_selection_id (_tmp66_);
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_combo_box_get_type (), GtkComboBox), _tmp67_);
-#line 4838 "PicasaPublishing.c"
+		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_combo_box_get_type (), GtkComboBox), publishing_picasa_publishing_parameters_get_major_axis_size_selection_id (parameters));
+#line 4787 "PicasaPublishing.c"
 	}
 #line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp68_ = self->priv->logout_button;
+	_tmp47_ = self->priv->logout_button;
 #line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_connect_object (_tmp68_, "clicked", (GCallback) _publishing_picasa_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
+	g_signal_connect_object (_tmp47_, "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"
-	_tmp69_ = self->priv->publish_button;
+	_tmp48_ = self->priv->publish_button;
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_connect_object (_tmp69_, "clicked", (GCallback) _publishing_picasa_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
+	g_signal_connect_object (_tmp48_, "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 4850 "PicasaPublishing.c"
+#line 4799 "PicasaPublishing.c"
 }
 
 
-PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane_new (GtkBuilder* builder, PublishingPicasaPublishingParameters* parameters, gboolean can_logout) {
+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 4857 "PicasaPublishing.c"
+#line 4810 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_publishing_options_pane_on_publish_clicked (PublishingPicasaPublishingOptionsPane* self) {
+static void
+publishing_picasa_publishing_options_pane_on_publish_clicked (PublishingPicasaPublishingOptionsPane* self)
+{
 	gint _tmp0_ = 0;
 	GtkComboBoxText* _tmp1_;
-	gint _tmp2_;
 	gint size_combo_last_active = 0;
-	PublishingPicasaPublishingParameters* _tmp5_;
-	PublishingPicasaPublishingParameters* _tmp6_;
-	PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp7_;
-	gint _tmp7__length1;
-	PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp8_;
-	gint _tmp9_;
-	PublishingPicasaPublishingParameters* _tmp10_;
-	GtkCheckButton* _tmp11_;
-	gboolean _tmp12_;
+	PublishingPicasaPublishingParameters* _tmp3_;
+	PublishingPicasaPublishingParameters* _tmp4_;
+	PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp5_;
+	gint _tmp5__length1;
+	PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp6_;
+	gint _tmp7_;
+	PublishingPicasaPublishingParameters* _tmp8_;
+	GtkCheckButton* _tmp9_;
 	PublishingPicasaAlbum** albums = NULL;
-	PublishingPicasaPublishingParameters* _tmp13_;
-	gint _tmp14_;
-	PublishingPicasaAlbum** _tmp15_;
+	PublishingPicasaPublishingParameters* _tmp10_;
+	gint _tmp11_;
+	PublishingPicasaAlbum** _tmp12_;
 	gint albums_length1;
 	gint _albums_size_;
-	PublishingPicasaPublishingParameters* _tmp16_;
-	GtkComboBoxText* _tmp17_;
-	gint _tmp18_;
+	PublishingPicasaPublishingParameters* _tmp13_;
+	GtkComboBoxText* _tmp14_;
+	PublishingPicasaAlbum* _tmp15_;
+	const gchar* _tmp16_;
+	PublishingPicasaPublishingParameters* _tmp17_;
+	GtkComboBoxText* _tmp18_;
 	PublishingPicasaAlbum* _tmp19_;
 	const gchar* _tmp20_;
-	PublishingPicasaPublishingParameters* _tmp21_;
-	GtkComboBoxText* _tmp22_;
-	gint _tmp23_;
-	PublishingPicasaAlbum* _tmp24_;
-	const gchar* _tmp25_;
 #line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = self->priv->size_combo;
 #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));
+	if (gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)) >= 0) {
+#line 4848 "PicasaPublishing.c"
+		GtkComboBoxText* _tmp2_;
 #line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (_tmp2_ >= 0) {
-#line 4899 "PicasaPublishing.c"
-		GtkComboBoxText* _tmp3_;
-		gint _tmp4_;
+		_tmp2_ = self->priv->size_combo;
 #line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp3_ = self->priv->size_combo;
-#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 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp0_ = _tmp4_;
-#line 4908 "PicasaPublishing.c"
+		_tmp0_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox));
+#line 4854 "PicasaPublishing.c"
 	} else {
 #line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp0_ = 0;
-#line 4912 "PicasaPublishing.c"
+#line 4858 "PicasaPublishing.c"
 	}
 #line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	size_combo_last_active = _tmp0_;
 #line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp5_ = self->priv->parameters;
+	_tmp3_ = self->priv->parameters;
 #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);
+	publishing_picasa_publishing_parameters_set_major_axis_size_selection_id (_tmp3_, size_combo_last_active);
 #line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp6_ = self->priv->parameters;
+	_tmp4_ = self->priv->parameters;
 #line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp7_ = self->priv->size_descriptions;
+	_tmp5_ = self->priv->size_descriptions;
 #line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp7__length1 = self->priv->size_descriptions_length1;
+	_tmp5__length1 = self->priv->size_descriptions_length1;
 #line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp8_ = _tmp7_[size_combo_last_active];
+	_tmp6_ = _tmp5_[size_combo_last_active];
 #line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp9_ = _tmp8_->major_axis_pixels;
+	_tmp7_ = _tmp6_->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_);
+	publishing_picasa_publishing_parameters_set_major_axis_size_pixels (_tmp4_, _tmp7_);
 #line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp10_ = self->priv->parameters;
+	_tmp8_ = self->priv->parameters;
 #line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp11_ = self->priv->strip_metadata_check;
+	_tmp9_ = 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_);
+	publishing_picasa_publishing_parameters_set_strip_metadata (_tmp8_, gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton)));
 #line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp13_ = self->priv->parameters;
+	_tmp10_ = self->priv->parameters;
 #line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp15_ = publishing_picasa_publishing_parameters_get_albums (_tmp13_, &_tmp14_);
+	_tmp12_ = publishing_picasa_publishing_parameters_get_albums (_tmp10_, &_tmp11_);
 #line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	albums = _tmp15_;
+	albums = _tmp12_;
 #line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	albums_length1 = _tmp14_;
+	albums_length1 = _tmp11_;
 #line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_albums_size_ = albums_length1;
 #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;
+	_tmp13_ = self->priv->parameters;
 #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));
+	_tmp14_ = self->priv->existing_albums_combo;
 #line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp19_ = albums[_tmp18_];
+	_tmp15_ = albums[gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_combo_box_get_type (), GtkComboBox))];
 #line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp20_ = _tmp19_->name;
+	_tmp16_ = _tmp15_->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;
+	publishing_picasa_publishing_parameters_set_target_album_name (_tmp13_, _tmp16_);
 #line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp22_ = self->priv->existing_albums_combo;
+	_tmp17_ = self->priv->parameters;
 #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));
+	_tmp18_ = self->priv->existing_albums_combo;
 #line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp24_ = albums[_tmp23_];
+	_tmp19_ = albums[gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_combo_box_get_type (), GtkComboBox))];
 #line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp25_ = _tmp24_->url;
+	_tmp20_ = _tmp19_->url;
 #line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_picasa_publishing_parameters_set_target_album_entry_url (_tmp21_, _tmp25_);
+	publishing_picasa_publishing_parameters_set_target_album_entry_url (_tmp17_, _tmp20_);
 #line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_emit (self, publishing_picasa_publishing_options_pane_signals[PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0);
 #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 4978 "PicasaPublishing.c"
+#line 4918 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_publishing_options_pane_on_logout_clicked (PublishingPicasaPublishingOptionsPane* self) {
+static void
+publishing_picasa_publishing_options_pane_on_logout_clicked (PublishingPicasaPublishingOptionsPane* self)
+{
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_emit (self, publishing_picasa_publishing_options_pane_signals[PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
-#line 4987 "PicasaPublishing.c"
+#line 4929 "PicasaPublishing.c"
 }
 
 
-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)
+{
 #line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if ((*length) == (*size)) {
 #line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1);
-#line 4998 "PicasaPublishing.c"
+#line 4945 "PicasaPublishing.c"
 	}
 #line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[*length] = NULL;
-#line 5004 "PicasaPublishing.c"
+#line 4951 "PicasaPublishing.c"
 }
 
 
-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)
+{
 #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if ((*length) == (*size)) {
 #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1);
-#line 5015 "PicasaPublishing.c"
+#line 4967 "PicasaPublishing.c"
 	}
 #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[*length] = NULL;
-#line 5021 "PicasaPublishing.c"
+#line 4973 "PicasaPublishing.c"
 }
 
 
-static void _vala_array_add16 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
+static void
+_vala_array_add17 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array,
+                   int* length,
+                   int* size,
+                   PublishingPicasaPublishingOptionsPaneSizeDescription* value)
+{
 #line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if ((*length) == (*size)) {
 #line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1);
-#line 5032 "PicasaPublishing.c"
+#line 4989 "PicasaPublishing.c"
 	}
 #line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[*length] = NULL;
-#line 5038 "PicasaPublishing.c"
+#line 4995 "PicasaPublishing.c"
 }
 
 
-static void _vala_array_add17 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
+static void
+_vala_array_add18 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array,
+                   int* length,
+                   int* size,
+                   PublishingPicasaPublishingOptionsPaneSizeDescription* value)
+{
 #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if ((*length) == (*size)) {
 #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1);
-#line 5049 "PicasaPublishing.c"
+#line 5011 "PicasaPublishing.c"
 	}
 #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[*length] = NULL;
-#line 5055 "PicasaPublishing.c"
+#line 5017 "PicasaPublishing.c"
 }
 
 
-static void _vala_array_add18 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
+static void
+_vala_array_add19 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array,
+                   int* length,
+                   int* size,
+                   PublishingPicasaPublishingOptionsPaneSizeDescription* value)
+{
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if ((*length) == (*size)) {
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1);
-#line 5066 "PicasaPublishing.c"
+#line 5033 "PicasaPublishing.c"
 	}
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[*length] = NULL;
-#line 5072 "PicasaPublishing.c"
+#line 5039 "PicasaPublishing.c"
 }
 
 
-static PublishingPicasaPublishingOptionsPaneSizeDescription** publishing_picasa_publishing_options_pane_create_size_descriptions (PublishingPicasaPublishingOptionsPane* self, int* result_length1) {
+static PublishingPicasaPublishingOptionsPaneSizeDescription**
+publishing_picasa_publishing_options_pane_create_size_descriptions (PublishingPicasaPublishingOptionsPane* self,
+                                                                    int* result_length1)
+{
 	PublishingPicasaPublishingOptionsPaneSizeDescription** result = NULL;
 	PublishingPicasaPublishingOptionsPaneSizeDescription** _result_ = NULL;
 	PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp0_;
@@ -5128,7 +5098,7 @@ static PublishingPicasaPublishingOptionsPaneSizeDescription** publishing_picasa_
 #line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = publishing_picasa_publishing_options_pane_size_description_new (_ ("Small (640 × 480 pixels)"), 640);
 #line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_vala_array_add14 (&_result_, &_result__length1, &__result__size_, _tmp2_);
+	_vala_array_add15 (&_result_, &_result__length1, &__result__size_, _tmp2_);
 #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp3_ = _result_;
 #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5136,7 +5106,7 @@ static PublishingPicasaPublishingOptionsPaneSizeDescription** publishing_picasa_
 #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4_ = publishing_picasa_publishing_options_pane_size_description_new (_ ("Medium (1024 × 768 pixels)"), 1024);
 #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_vala_array_add15 (&_result_, &_result__length1, &__result__size_, _tmp4_);
+	_vala_array_add16 (&_result_, &_result__length1, &__result__size_, _tmp4_);
 #line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp5_ = _result_;
 #line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5144,7 +5114,7 @@ static PublishingPicasaPublishingOptionsPaneSizeDescription** publishing_picasa_
 #line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp6_ = publishing_picasa_publishing_options_pane_size_description_new (_ ("Recommended (1600 × 1200 pixels)"), 1600);
 #line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_vala_array_add16 (&_result_, &_result__length1, &__result__size_, _tmp6_);
+	_vala_array_add17 (&_result_, &_result__length1, &__result__size_, _tmp6_);
 #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp7_ = _result_;
 #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5152,7 +5122,7 @@ static PublishingPicasaPublishingOptionsPaneSizeDescription** publishing_picasa_
 #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp8_ = publishing_picasa_publishing_options_pane_size_description_new (_ ("Google+ (2048 × 1536 pixels)"), 2048);
 #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_vala_array_add17 (&_result_, &_result__length1, &__result__size_, _tmp8_);
+	_vala_array_add18 (&_result_, &_result__length1, &__result__size_, _tmp8_);
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp9_ = _result_;
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5160,7 +5130,7 @@ static PublishingPicasaPublishingOptionsPaneSizeDescription** publishing_picasa_
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp10_ = publishing_picasa_publishing_options_pane_size_description_new (_ ("Original Size"), PUBLISHING_PICASA_PUBLISHING_PARAMETERS_ORIGINAL_SIZE);
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_vala_array_add18 (&_result_, &_result__length1, &__result__size_, _tmp10_);
+	_vala_array_add19 (&_result_, &_result__length1, &__result__size_, _tmp10_);
 #line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp11_ = _result_;
 #line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5169,17 +5139,19 @@ static PublishingPicasaPublishingOptionsPaneSizeDescription** publishing_picasa_
 	if (result_length1) {
 #line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*result_length1 = _tmp11__length1;
-#line 5157 "PicasaPublishing.c"
+#line 5127 "PicasaPublishing.c"
 	}
 #line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = _tmp11_;
 #line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 5163 "PicasaPublishing.c"
+#line 5133 "PicasaPublishing.c"
 }
 
 
-void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublishingOptionsPane* self) {
+void
+publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublishingOptionsPane* self)
+{
 	gint default_album_id = 0;
 	gchar* last_album = NULL;
 	PublishingPicasaPublishingParameters* _tmp0_;
@@ -5211,19 +5183,19 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
 	albums_length1 = _tmp3_;
 #line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_albums_size_ = albums_length1;
-#line 5199 "PicasaPublishing.c"
+#line 5171 "PicasaPublishing.c"
 	{
 		gint i = 0;
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		i = 0;
-#line 5204 "PicasaPublishing.c"
+#line 5176 "PicasaPublishing.c"
 		{
 			gboolean _tmp5_ = FALSE;
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_tmp5_ = TRUE;
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			while (TRUE) {
-#line 5211 "PicasaPublishing.c"
+#line 5183 "PicasaPublishing.c"
 				gint _tmp7_;
 				PublishingPicasaAlbum** _tmp8_;
 				gint _tmp8__length1;
@@ -5242,13 +5214,13 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
 				const gchar* _tmp19_;
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				if (!_tmp5_) {
-#line 5230 "PicasaPublishing.c"
+#line 5202 "PicasaPublishing.c"
 					gint _tmp6_;
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp6_ = i;
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					i = _tmp6_ + 1;
-#line 5236 "PicasaPublishing.c"
+#line 5208 "PicasaPublishing.c"
 				}
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp5_ = FALSE;
@@ -5262,7 +5234,7 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
 				if (!(_tmp7_ < _tmp8__length1)) {
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					break;
-#line 5250 "PicasaPublishing.c"
+#line 5222 "PicasaPublishing.c"
 				}
 #line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp9_ = self->priv->existing_albums_combo;
@@ -5294,7 +5266,7 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
 				if (g_strcmp0 (_tmp18_, _tmp19_) == 0) {
 #line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp14_ = TRUE;
-#line 5282 "PicasaPublishing.c"
+#line 5254 "PicasaPublishing.c"
 				} else {
 					gboolean _tmp20_ = FALSE;
 					gboolean _tmp21_ = FALSE;
@@ -5317,7 +5289,7 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
 					if (g_strcmp0 (_tmp25_, PUBLISHING_PICASA_DEFAULT_ALBUM_NAME) == 0) {
 #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp21_ = TRUE;
-#line 5305 "PicasaPublishing.c"
+#line 5277 "PicasaPublishing.c"
 					} else {
 						PublishingPicasaAlbum** _tmp26_;
 						gint _tmp26__length1;
@@ -5336,35 +5308,35 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
 						_tmp29_ = _tmp28_->name;
 #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp21_ = g_strcmp0 (_tmp29_, _ ("Default album")) == 0;
-#line 5324 "PicasaPublishing.c"
+#line 5296 "PicasaPublishing.c"
 					}
 #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					if (_tmp21_) {
-#line 5328 "PicasaPublishing.c"
+#line 5300 "PicasaPublishing.c"
 						gint _tmp30_;
 #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp30_ = default_album_id;
 #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp20_ = _tmp30_ == -1;
-#line 5334 "PicasaPublishing.c"
+#line 5306 "PicasaPublishing.c"
 					} else {
 #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp20_ = FALSE;
-#line 5338 "PicasaPublishing.c"
+#line 5310 "PicasaPublishing.c"
 					}
 #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp14_ = _tmp20_;
-#line 5342 "PicasaPublishing.c"
+#line 5314 "PicasaPublishing.c"
 				}
 #line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				if (_tmp14_) {
-#line 5346 "PicasaPublishing.c"
+#line 5318 "PicasaPublishing.c"
 					gint _tmp31_;
 #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp31_ = i;
 #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					default_album_id = _tmp31_;
-#line 5352 "PicasaPublishing.c"
+#line 5324 "PicasaPublishing.c"
 				}
 			}
 		}
@@ -5373,7 +5345,7 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
 	_tmp32_ = default_album_id;
 #line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (_tmp32_ >= 0) {
-#line 5361 "PicasaPublishing.c"
+#line 5333 "PicasaPublishing.c"
 		GtkComboBoxText* _tmp33_;
 		gint _tmp34_;
 #line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5382,17 +5354,19 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
 		_tmp34_ = default_album_id;
 #line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_combo_box_get_type (), GtkComboBox), _tmp34_);
-#line 5370 "PicasaPublishing.c"
+#line 5342 "PicasaPublishing.c"
 	}
 #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 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (last_album);
-#line 5376 "PicasaPublishing.c"
+#line 5348 "PicasaPublishing.c"
 }
 
 
-static GtkWidget* publishing_picasa_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base) {
+static GtkWidget*
+publishing_picasa_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base)
+{
 	PublishingPicasaPublishingOptionsPane * self;
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_;
@@ -5407,11 +5381,13 @@ static GtkWidget* publishing_picasa_publishing_options_pane_real_get_widget (Spi
 	result = _tmp1_;
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 5395 "PicasaPublishing.c"
+#line 5369 "PicasaPublishing.c"
 }
 
 
-static SpitPublishingDialogPaneGeometryOptions publishing_picasa_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
+static SpitPublishingDialogPaneGeometryOptions
+publishing_picasa_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base)
+{
 	PublishingPicasaPublishingOptionsPane * self;
 	SpitPublishingDialogPaneGeometryOptions result = 0;
 #line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5420,131 +5396,155 @@ static SpitPublishingDialogPaneGeometryOptions publishing_picasa_publishing_opti
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
 #line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 5408 "PicasaPublishing.c"
+#line 5384 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
+static void
+publishing_picasa_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base)
+{
 	PublishingPicasaPublishingOptionsPane * self;
 #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 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_publishing_options_pane_installed (self);
-#line 5418 "PicasaPublishing.c"
+#line 5396 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
+static void
+publishing_picasa_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base)
+{
 	PublishingPicasaPublishingOptionsPane * self;
 #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 5426 "PicasaPublishing.c"
+#line 5406 "PicasaPublishing.c"
 }
 
 
-static PublishingPicasaPublishingOptionsPaneSizeDescription* publishing_picasa_publishing_options_pane_size_description_construct (GType object_type, 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)
+{
 	PublishingPicasaPublishingOptionsPaneSizeDescription* self = NULL;
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-	gint _tmp2_;
+	gchar* _tmp0_;
 #line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = (PublishingPicasaPublishingOptionsPaneSizeDescription*) g_type_create_instance (object_type);
 #line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = name;
-#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (name);
 #line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->name);
 #line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->name = _tmp1_;
+	self->name = _tmp0_;
 #line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp2_ = major_axis_pixels;
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->major_axis_pixels = _tmp2_;
+	self->major_axis_pixels = major_axis_pixels;
 #line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 5453 "PicasaPublishing.c"
+#line 5431 "PicasaPublishing.c"
 }
 
 
-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_new (const gchar* name,
+                                                                gint major_axis_pixels)
+{
 #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 5460 "PicasaPublishing.c"
+#line 5441 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_publishing_options_pane_value_size_description_init (GValue* value) {
+static void
+publishing_picasa_publishing_options_pane_value_size_description_init (GValue* value)
+{
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 5467 "PicasaPublishing.c"
+#line 5450 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_publishing_options_pane_value_size_description_free_value (GValue* value) {
+static void
+publishing_picasa_publishing_options_pane_value_size_description_free_value (GValue* value)
+{
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (value->data[0].v_pointer) {
 #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 5476 "PicasaPublishing.c"
+#line 5461 "PicasaPublishing.c"
 	}
 }
 
 
-static void publishing_picasa_publishing_options_pane_value_size_description_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_picasa_publishing_options_pane_value_size_description_copy_value (const GValue* src_value,
+                                                                             GValue* dest_value)
+{
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (src_value->data[0].v_pointer) {
 #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 5486 "PicasaPublishing.c"
+#line 5474 "PicasaPublishing.c"
 	} else {
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 5490 "PicasaPublishing.c"
+#line 5478 "PicasaPublishing.c"
 	}
 }
 
 
-static gpointer publishing_picasa_publishing_options_pane_value_size_description_peek_pointer (const GValue* value) {
+static gpointer
+publishing_picasa_publishing_options_pane_value_size_description_peek_pointer (const GValue* value)
+{
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return value->data[0].v_pointer;
-#line 5498 "PicasaPublishing.c"
+#line 5488 "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) {
+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 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 5505 "PicasaPublishing.c"
+#line 5500 "PicasaPublishing.c"
 		PublishingPicasaPublishingOptionsPaneSizeDescription * object;
 		object = collect_values[0].v_pointer;
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #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 5512 "PicasaPublishing.c"
+#line 5507 "PicasaPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #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 5516 "PicasaPublishing.c"
+#line 5511 "PicasaPublishing.c"
 		}
 #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 5520 "PicasaPublishing.c"
+#line 5515 "PicasaPublishing.c"
 	} else {
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 5524 "PicasaPublishing.c"
+#line 5519 "PicasaPublishing.c"
 	}
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return NULL;
-#line 5528 "PicasaPublishing.c"
+#line 5523 "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) {
+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 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5573,7 +5573,13 @@ static gchar* publishing_picasa_publishing_options_pane_value_size_description_l
 }
 
 
-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) {
+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 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);
@@ -5583,20 +5589,25 @@ static GParamSpec* publishing_picasa_publishing_options_pane_param_spec_size_des
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 5571 "PicasaPublishing.c"
+#line 5577 "PicasaPublishing.c"
 }
 
 
-static gpointer publishing_picasa_publishing_options_pane_value_get_size_description (const GValue* value) {
+static gpointer
+publishing_picasa_publishing_options_pane_value_get_size_description (const GValue* value)
+{
 #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 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return value->data[0].v_pointer;
-#line 5580 "PicasaPublishing.c"
+#line 5588 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_publishing_options_pane_value_set_size_description (GValue* value, gpointer v_object) {
+static void
+publishing_picasa_publishing_options_pane_value_set_size_description (GValue* value,
+                                                                      gpointer v_object)
+{
 	PublishingPicasaPublishingOptionsPaneSizeDescription * old;
 #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));
@@ -5612,22 +5623,25 @@ static void publishing_picasa_publishing_options_pane_value_set_size_description
 		value->data[0].v_pointer = v_object;
 #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 5600 "PicasaPublishing.c"
+#line 5611 "PicasaPublishing.c"
 	} else {
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 5604 "PicasaPublishing.c"
+#line 5615 "PicasaPublishing.c"
 	}
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (old) {
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_publishing_options_pane_size_description_unref (old);
-#line 5610 "PicasaPublishing.c"
+#line 5621 "PicasaPublishing.c"
 	}
 }
 
 
-static void publishing_picasa_publishing_options_pane_value_take_size_description (GValue* value, gpointer v_object) {
+static void
+publishing_picasa_publishing_options_pane_value_take_size_description (GValue* value,
+                                                                       gpointer v_object)
+{
 	PublishingPicasaPublishingOptionsPaneSizeDescription * old;
 #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));
@@ -5641,38 +5655,44 @@ static void publishing_picasa_publishing_options_pane_value_take_size_descriptio
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 5629 "PicasaPublishing.c"
+#line 5643 "PicasaPublishing.c"
 	} else {
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 5633 "PicasaPublishing.c"
+#line 5647 "PicasaPublishing.c"
 	}
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (old) {
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_publishing_options_pane_size_description_unref (old);
-#line 5639 "PicasaPublishing.c"
+#line 5653 "PicasaPublishing.c"
 	}
 }
 
 
-static void publishing_picasa_publishing_options_pane_size_description_class_init (PublishingPicasaPublishingOptionsPaneSizeDescriptionClass * klass) {
+static void
+publishing_picasa_publishing_options_pane_size_description_class_init (PublishingPicasaPublishingOptionsPaneSizeDescriptionClass * klass)
+{
 #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 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	((PublishingPicasaPublishingOptionsPaneSizeDescriptionClass *) klass)->finalize = publishing_picasa_publishing_options_pane_size_description_finalize;
-#line 5649 "PicasaPublishing.c"
+#line 5665 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_publishing_options_pane_size_description_instance_init (PublishingPicasaPublishingOptionsPaneSizeDescription * self) {
+static void
+publishing_picasa_publishing_options_pane_size_description_instance_init (PublishingPicasaPublishingOptionsPaneSizeDescription * self)
+{
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->ref_count = 1;
-#line 5656 "PicasaPublishing.c"
+#line 5674 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_publishing_options_pane_size_description_finalize (PublishingPicasaPublishingOptionsPaneSizeDescription * obj) {
+static void
+publishing_picasa_publishing_options_pane_size_description_finalize (PublishingPicasaPublishingOptionsPaneSizeDescription * obj)
+{
 	PublishingPicasaPublishingOptionsPaneSizeDescription * self;
 #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);
@@ -5680,11 +5700,13 @@ static void publishing_picasa_publishing_options_pane_size_description_finalize
 	g_signal_handlers_destroy (self);
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->name);
-#line 5668 "PicasaPublishing.c"
+#line 5688 "PicasaPublishing.c"
 }
 
 
-static GType publishing_picasa_publishing_options_pane_size_description_get_type (void) {
+static GType
+publishing_picasa_publishing_options_pane_size_description_get_type (void)
+{
 	static volatile gsize publishing_picasa_publishing_options_pane_size_description_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_picasa_publishing_options_pane_size_description_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { publishing_picasa_publishing_options_pane_value_size_description_init, publishing_picasa_publishing_options_pane_value_size_description_free_value, publishing_picasa_publishing_options_pane_value_size_description_copy_value, publishing_picasa_publishing_options_pane_value_size_description_peek_pointer, "p", publishing_picasa_publishing_options_pane_value_size_description_collect_value, "p", publishing_picasa_publishing_options_pane_value_size_description_lcopy_value };
@@ -5698,18 +5720,22 @@ static GType publishing_picasa_publishing_options_pane_size_description_get_type
 }
 
 
-static gpointer publishing_picasa_publishing_options_pane_size_description_ref (gpointer instance) {
+static gpointer
+publishing_picasa_publishing_options_pane_size_description_ref (gpointer instance)
+{
 	PublishingPicasaPublishingOptionsPaneSizeDescription * self;
 	self = instance;
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return instance;
-#line 5693 "PicasaPublishing.c"
+#line 5717 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_publishing_options_pane_size_description_unref (gpointer instance) {
+static void
+publishing_picasa_publishing_options_pane_size_description_unref (gpointer instance)
+{
 	PublishingPicasaPublishingOptionsPaneSizeDescription * self;
 	self = instance;
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5718,12 +5744,14 @@ static void publishing_picasa_publishing_options_pane_size_description_unref (gp
 		PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_SIZE_DESCRIPTION_GET_CLASS (self)->finalize (self);
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 5706 "PicasaPublishing.c"
+#line 5732 "PicasaPublishing.c"
 	}
 }
 
 
-static void publishing_picasa_publishing_options_pane_class_init (PublishingPicasaPublishingOptionsPaneClass * klass) {
+static void
+publishing_picasa_publishing_options_pane_class_init (PublishingPicasaPublishingOptionsPaneClass * klass)
+{
 #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 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5734,11 +5762,13 @@ static void publishing_picasa_publishing_options_pane_class_init (PublishingPica
 	publishing_picasa_publishing_options_pane_signals[PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL] = 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 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_publishing_options_pane_signals[PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL] = 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 5722 "PicasaPublishing.c"
+#line 5750 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
+static void
+publishing_picasa_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface)
+{
 #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 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5749,11 +5779,13 @@ static void publishing_picasa_publishing_options_pane_spit_publishing_dialog_pan
 	iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_picasa_publishing_options_pane_real_on_pane_installed;
 #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 5737 "PicasaPublishing.c"
+#line 5767 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_publishing_options_pane_instance_init (PublishingPicasaPublishingOptionsPane * self) {
+static void
+publishing_picasa_publishing_options_pane_instance_init (PublishingPicasaPublishingOptionsPane * self)
+{
 #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv = PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
 #line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5776,11 +5808,13 @@ static void publishing_picasa_publishing_options_pane_instance_init (PublishingP
 	self->priv->publish_button = NULL;
 #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->logout_button = NULL;
-#line 5764 "PicasaPublishing.c"
+#line 5796 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_publishing_options_pane_finalize (GObject * obj) {
+static void
+publishing_picasa_publishing_options_pane_finalize (GObject * obj)
+{
 	PublishingPicasaPublishingOptionsPane * self;
 #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);
@@ -5810,11 +5844,13 @@ static void publishing_picasa_publishing_options_pane_finalize (GObject * obj) {
 	_publishing_picasa_publishing_parameters_unref0 (self->priv->parameters);
 #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	G_OBJECT_CLASS (publishing_picasa_publishing_options_pane_parent_class)->finalize (obj);
-#line 5798 "PicasaPublishing.c"
+#line 5832 "PicasaPublishing.c"
 }
 
 
-GType publishing_picasa_publishing_options_pane_get_type (void) {
+GType
+publishing_picasa_publishing_options_pane_get_type (void)
+{
 	static volatile gsize publishing_picasa_publishing_options_pane_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_picasa_publishing_options_pane_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingPicasaPublishingOptionsPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_picasa_publishing_options_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPicasaPublishingOptionsPane), 0, (GInstanceInitFunc) publishing_picasa_publishing_options_pane_instance_init, NULL };
@@ -5828,7 +5864,9 @@ GType publishing_picasa_publishing_options_pane_get_type (void) {
 }
 
 
-PublishingPicasaPublishingParameters* publishing_picasa_publishing_parameters_construct (GType object_type) {
+PublishingPicasaPublishingParameters*
+publishing_picasa_publishing_parameters_construct (GType object_type)
+{
 	PublishingPicasaPublishingParameters* self = NULL;
 	gchar* _tmp0_;
 #line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5867,18 +5905,22 @@ PublishingPicasaPublishingParameters* publishing_picasa_publishing_parameters_co
 	self->priv->media_type = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO;
 #line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 5855 "PicasaPublishing.c"
+#line 5893 "PicasaPublishing.c"
 }
 
 
-PublishingPicasaPublishingParameters* publishing_picasa_publishing_parameters_new (void) {
+PublishingPicasaPublishingParameters*
+publishing_picasa_publishing_parameters_new (void)
+{
 #line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return publishing_picasa_publishing_parameters_construct (PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS);
-#line 5862 "PicasaPublishing.c"
+#line 5902 "PicasaPublishing.c"
 }
 
 
-gchar* publishing_picasa_publishing_parameters_get_target_album_name (PublishingPicasaPublishingParameters* self) {
+gchar*
+publishing_picasa_publishing_parameters_get_target_album_name (PublishingPicasaPublishingParameters* self)
+{
 	gchar* result = NULL;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
@@ -5892,49 +5934,51 @@ gchar* publishing_picasa_publishing_parameters_get_target_album_name (Publishing
 	result = _tmp1_;
 #line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 5880 "PicasaPublishing.c"
+#line 5922 "PicasaPublishing.c"
 }
 
 
-void publishing_picasa_publishing_parameters_set_target_album_name (PublishingPicasaPublishingParameters* self, const gchar* target_album_name) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
+void
+publishing_picasa_publishing_parameters_set_target_album_name (PublishingPicasaPublishingParameters* self,
+                                                               const gchar* target_album_name)
+{
+	gchar* _tmp0_;
 #line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
 #line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (target_album_name != NULL);
 #line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = target_album_name;
-#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (target_album_name);
 #line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->priv->target_album_name);
 #line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->target_album_name = _tmp1_;
-#line 5899 "PicasaPublishing.c"
+	self->priv->target_album_name = _tmp0_;
+#line 5941 "PicasaPublishing.c"
 }
 
 
-void publishing_picasa_publishing_parameters_set_target_album_entry_url (PublishingPicasaPublishingParameters* self, const gchar* target_album_url) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
+void
+publishing_picasa_publishing_parameters_set_target_album_entry_url (PublishingPicasaPublishingParameters* self,
+                                                                    const gchar* target_album_url)
+{
+	gchar* _tmp0_;
 #line 688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
 #line 688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (target_album_url != NULL);
 #line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = target_album_url;
-#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (target_album_url);
 #line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->priv->target_album_url);
 #line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->target_album_url = _tmp1_;
-#line 5918 "PicasaPublishing.c"
+	self->priv->target_album_url = _tmp0_;
+#line 5960 "PicasaPublishing.c"
 }
 
 
-gchar* publishing_picasa_publishing_parameters_get_target_album_entry_url (PublishingPicasaPublishingParameters* self) {
+gchar*
+publishing_picasa_publishing_parameters_get_target_album_entry_url (PublishingPicasaPublishingParameters* self)
+{
 	gchar* result = NULL;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
@@ -5948,173 +5992,164 @@ gchar* publishing_picasa_publishing_parameters_get_target_album_entry_url (Publi
 	result = _tmp1_;
 #line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 5936 "PicasaPublishing.c"
+#line 5980 "PicasaPublishing.c"
 }
 
 
-static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
+static gchar*
+string_replace (const gchar* self,
+                const gchar* old,
+                const gchar* replacement)
+{
 	gchar* result = NULL;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	if ((*((gchar*) self)) == '\0') {
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
-#line 5955 "PicasaPublishing.c"
+#line 6003 "PicasaPublishing.c"
 	} else {
-		const gchar* _tmp2_;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp2_ = old;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp1_ = (*((gchar*) _tmp2_)) == '\0';
-#line 5962 "PicasaPublishing.c"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp1_ = (*((gchar*) old)) == '\0';
+#line 6007 "PicasaPublishing.c"
 	}
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_tmp0_ = TRUE;
-#line 5968 "PicasaPublishing.c"
+#line 6013 "PicasaPublishing.c"
 	} else {
-		const gchar* _tmp3_;
-		const gchar* _tmp4_;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp3_ = old;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4_ = replacement;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
-#line 5978 "PicasaPublishing.c"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp0_ = g_strcmp0 (old, replacement) == 0;
+#line 6017 "PicasaPublishing.c"
 	}
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 5982 "PicasaPublishing.c"
-		gchar* _tmp5_;
-#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp5_ = g_strdup (self);
-#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = _tmp5_;
-#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 6021 "PicasaPublishing.c"
+		gchar* _tmp2_;
+#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp2_ = g_strdup (self);
+#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		result = _tmp2_;
+#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return result;
-#line 5990 "PicasaPublishing.c"
+#line 6029 "PicasaPublishing.c"
 	}
 	{
 		GRegex* regex = NULL;
-		const gchar* _tmp6_;
-		gchar* _tmp7_;
-		gchar* _tmp8_;
-		GRegex* _tmp9_;
-		GRegex* _tmp10_;
-		gchar* _tmp11_ = NULL;
-		GRegex* _tmp12_;
-		const gchar* _tmp13_;
-		gchar* _tmp14_;
-		gchar* _tmp15_;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp6_ = old;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp7_ = g_regex_escape_string (_tmp6_, -1);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp8_ = _tmp7_;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp10_ = _tmp9_;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp8_);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		regex = _tmp10_;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		gchar* _tmp3_;
+		gchar* _tmp4_;
+		GRegex* _tmp5_;
+		GRegex* _tmp6_;
+		gchar* _tmp7_ = NULL;
+		GRegex* _tmp8_;
+		gchar* _tmp9_;
+		gchar* _tmp10_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp3_ = g_regex_escape_string (old, -1);
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp4_ = _tmp3_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp5_ = g_regex_new (_tmp4_, 0, 0, &_inner_error_);
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp6_ = _tmp5_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp4_);
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		regex = _tmp6_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 6022 "PicasaPublishing.c"
+#line 6057 "PicasaPublishing.c"
 				goto __catch12_g_regex_error;
 			}
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			return NULL;
-#line 6031 "PicasaPublishing.c"
+#line 6066 "PicasaPublishing.c"
 		}
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp12_ = regex;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp13_ = replacement;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp11_ = _tmp14_;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp8_ = regex;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp9_ = g_regex_replace_literal (_tmp8_, self, (gssize) -1, 0, replacement, 0, &_inner_error_);
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp7_ = _tmp9_;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 6047 "PicasaPublishing.c"
+#line 6080 "PicasaPublishing.c"
 				goto __catch12_g_regex_error;
 			}
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			return NULL;
-#line 6058 "PicasaPublishing.c"
+#line 6091 "PicasaPublishing.c"
 		}
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp15_ = _tmp11_;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp11_ = NULL;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = _tmp15_;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp11_);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp10_ = _tmp7_;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp7_ = NULL;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		result = _tmp10_;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp7_);
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return result;
-#line 6072 "PicasaPublishing.c"
+#line 6105 "PicasaPublishing.c"
 	}
 	goto __finally12;
 	__catch12_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1429 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 6086 "PicasaPublishing.c"
+#line 6119 "PicasaPublishing.c"
 	}
 	__finally12:
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return NULL;
-#line 6097 "PicasaPublishing.c"
+#line 6130 "PicasaPublishing.c"
 	}
 }
 
 
-gchar* publishing_picasa_publishing_parameters_get_target_album_feed_url (PublishingPicasaPublishingParameters* self) {
+gchar*
+publishing_picasa_publishing_parameters_get_target_album_feed_url (PublishingPicasaPublishingParameters* self)
+{
 	gchar* result = NULL;
 	gchar* entry_url = NULL;
 	gchar* _tmp0_;
@@ -6136,11 +6171,13 @@ gchar* publishing_picasa_publishing_parameters_get_target_album_feed_url (Publis
 	_g_free0 (entry_url);
 #line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 6124 "PicasaPublishing.c"
+#line 6159 "PicasaPublishing.c"
 }
 
 
-gchar* publishing_picasa_publishing_parameters_get_user_name (PublishingPicasaPublishingParameters* self) {
+gchar*
+publishing_picasa_publishing_parameters_get_user_name (PublishingPicasaPublishingParameters* self)
+{
 	gchar* result = NULL;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
@@ -6154,58 +6191,66 @@ gchar* publishing_picasa_publishing_parameters_get_user_name (PublishingPicasaPu
 	result = _tmp1_;
 #line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 6142 "PicasaPublishing.c"
+#line 6179 "PicasaPublishing.c"
 }
 
 
-void publishing_picasa_publishing_parameters_set_user_name (PublishingPicasaPublishingParameters* self, const gchar* user_name) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
+void
+publishing_picasa_publishing_parameters_set_user_name (PublishingPicasaPublishingParameters* self,
+                                                       const gchar* user_name)
+{
+	gchar* _tmp0_;
 #line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
 #line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (user_name != NULL);
 #line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = user_name;
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (user_name);
 #line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->priv->user_name);
 #line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->user_name = _tmp1_;
-#line 6161 "PicasaPublishing.c"
+	self->priv->user_name = _tmp0_;
+#line 6198 "PicasaPublishing.c"
 }
 
 
-static gpointer _publishing_picasa_album_ref0 (gpointer self) {
+static gpointer
+_publishing_picasa_album_ref0 (gpointer self)
+{
 #line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self ? publishing_picasa_album_ref (self) : NULL;
-#line 6168 "PicasaPublishing.c"
+#line 6207 "PicasaPublishing.c"
 }
 
 
-static PublishingPicasaAlbum** _vala_array_dup5 (PublishingPicasaAlbum** self, int length) {
+static PublishingPicasaAlbum**
+_vala_array_dup5 (PublishingPicasaAlbum** self,
+                  int length)
+{
 	PublishingPicasaAlbum** result;
 	int i;
 #line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = g_new0 (PublishingPicasaAlbum*, length + 1);
 #line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 6179 "PicasaPublishing.c"
+#line 6221 "PicasaPublishing.c"
 		PublishingPicasaAlbum* _tmp0_;
 #line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp0_ = _publishing_picasa_album_ref0 (self[i]);
 #line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		result[i] = _tmp0_;
-#line 6185 "PicasaPublishing.c"
+#line 6227 "PicasaPublishing.c"
 	}
 #line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 6189 "PicasaPublishing.c"
+#line 6231 "PicasaPublishing.c"
 }
 
 
-PublishingPicasaAlbum** publishing_picasa_publishing_parameters_get_albums (PublishingPicasaPublishingParameters* self, int* result_length1) {
+PublishingPicasaAlbum**
+publishing_picasa_publishing_parameters_get_albums (PublishingPicasaPublishingParameters* self,
+                                                    int* result_length1)
+{
 	PublishingPicasaAlbum** result = NULL;
 	PublishingPicasaAlbum** _tmp0_;
 	gint _tmp0__length1;
@@ -6231,77 +6276,80 @@ PublishingPicasaAlbum** publishing_picasa_publishing_parameters_get_albums (Publ
 	if (result_length1) {
 #line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*result_length1 = _tmp2__length1;
-#line 6219 "PicasaPublishing.c"
+#line 6264 "PicasaPublishing.c"
 	}
 #line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = _tmp2_;
 #line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 6225 "PicasaPublishing.c"
+#line 6270 "PicasaPublishing.c"
 }
 
 
-static PublishingPicasaAlbum** _vala_array_dup6 (PublishingPicasaAlbum** self, int length) {
+static PublishingPicasaAlbum**
+_vala_array_dup6 (PublishingPicasaAlbum** self,
+                  int length)
+{
 	PublishingPicasaAlbum** result;
 	int i;
 #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = g_new0 (PublishingPicasaAlbum*, length + 1);
 #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 6236 "PicasaPublishing.c"
+#line 6284 "PicasaPublishing.c"
 		PublishingPicasaAlbum* _tmp0_;
 #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp0_ = _publishing_picasa_album_ref0 (self[i]);
 #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		result[i] = _tmp0_;
-#line 6242 "PicasaPublishing.c"
+#line 6290 "PicasaPublishing.c"
 	}
 #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 6246 "PicasaPublishing.c"
+#line 6294 "PicasaPublishing.c"
 }
 
 
-void publishing_picasa_publishing_parameters_set_albums (PublishingPicasaPublishingParameters* self, PublishingPicasaAlbum** albums, int albums_length1) {
+void
+publishing_picasa_publishing_parameters_set_albums (PublishingPicasaPublishingParameters* self,
+                                                    PublishingPicasaAlbum** albums,
+                                                    int albums_length1)
+{
 	PublishingPicasaAlbum** _tmp0_;
 	gint _tmp0__length1;
-	PublishingPicasaAlbum** _tmp1_;
-	gint _tmp1__length1;
 #line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
 #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = albums;
+	_tmp0_ = (albums != NULL) ? _vala_array_dup6 (albums, albums_length1) : ((gpointer) albums);
 #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0__length1 = albums_length1;
 #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup6 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp1__length1 = _tmp0__length1;
-#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 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->albums = _tmp1_;
+	self->priv->albums = _tmp0_;
 #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->albums_length1 = _tmp1__length1;
+	self->priv->albums_length1 = _tmp0__length1;
 #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->_albums_size_ = self->priv->albums_length1;
-#line 6273 "PicasaPublishing.c"
+#line 6319 "PicasaPublishing.c"
 }
 
 
-void publishing_picasa_publishing_parameters_set_major_axis_size_pixels (PublishingPicasaPublishingParameters* self, gint pixels) {
-	gint _tmp0_;
+void
+publishing_picasa_publishing_parameters_set_major_axis_size_pixels (PublishingPicasaPublishingParameters* self,
+                                                                    gint pixels)
+{
 #line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
 #line 720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = pixels;
-#line 720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->major_axis_size_pixels = _tmp0_;
-#line 6285 "PicasaPublishing.c"
+	self->priv->major_axis_size_pixels = pixels;
+#line 6331 "PicasaPublishing.c"
 }
 
 
-gint publishing_picasa_publishing_parameters_get_major_axis_size_pixels (PublishingPicasaPublishingParameters* self) {
+gint
+publishing_picasa_publishing_parameters_get_major_axis_size_pixels (PublishingPicasaPublishingParameters* self)
+{
 	gint result = 0;
 	gint _tmp0_;
 #line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -6312,23 +6360,25 @@ gint publishing_picasa_publishing_parameters_get_major_axis_size_pixels (Publish
 	result = _tmp0_;
 #line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 6300 "PicasaPublishing.c"
+#line 6348 "PicasaPublishing.c"
 }
 
 
-void publishing_picasa_publishing_parameters_set_major_axis_size_selection_id (PublishingPicasaPublishingParameters* self, gint selection_id) {
-	gint _tmp0_;
+void
+publishing_picasa_publishing_parameters_set_major_axis_size_selection_id (PublishingPicasaPublishingParameters* self,
+                                                                          gint selection_id)
+{
 #line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
 #line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = selection_id;
-#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->major_axis_size_selection_id = _tmp0_;
-#line 6312 "PicasaPublishing.c"
+	self->priv->major_axis_size_selection_id = selection_id;
+#line 6360 "PicasaPublishing.c"
 }
 
 
-gint publishing_picasa_publishing_parameters_get_major_axis_size_selection_id (PublishingPicasaPublishingParameters* self) {
+gint
+publishing_picasa_publishing_parameters_get_major_axis_size_selection_id (PublishingPicasaPublishingParameters* self)
+{
 	gint result = 0;
 	gint _tmp0_;
 #line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -6339,23 +6389,25 @@ gint publishing_picasa_publishing_parameters_get_major_axis_size_selection_id (P
 	result = _tmp0_;
 #line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 6327 "PicasaPublishing.c"
+#line 6377 "PicasaPublishing.c"
 }
 
 
-void publishing_picasa_publishing_parameters_set_strip_metadata (PublishingPicasaPublishingParameters* self, gboolean strip_metadata) {
-	gboolean _tmp0_;
+void
+publishing_picasa_publishing_parameters_set_strip_metadata (PublishingPicasaPublishingParameters* self,
+                                                            gboolean strip_metadata)
+{
 #line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
 #line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = strip_metadata;
-#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->strip_metadata = _tmp0_;
-#line 6339 "PicasaPublishing.c"
+	self->priv->strip_metadata = strip_metadata;
+#line 6389 "PicasaPublishing.c"
 }
 
 
-gboolean publishing_picasa_publishing_parameters_get_strip_metadata (PublishingPicasaPublishingParameters* self) {
+gboolean
+publishing_picasa_publishing_parameters_get_strip_metadata (PublishingPicasaPublishingParameters* self)
+{
 	gboolean result = FALSE;
 	gboolean _tmp0_;
 #line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -6366,23 +6418,25 @@ gboolean publishing_picasa_publishing_parameters_get_strip_metadata (PublishingP
 	result = _tmp0_;
 #line 740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 6354 "PicasaPublishing.c"
+#line 6406 "PicasaPublishing.c"
 }
 
 
-void publishing_picasa_publishing_parameters_set_media_type (PublishingPicasaPublishingParameters* self, SpitPublishingPublisherMediaType media_type) {
-	SpitPublishingPublisherMediaType _tmp0_;
+void
+publishing_picasa_publishing_parameters_set_media_type (PublishingPicasaPublishingParameters* self,
+                                                        SpitPublishingPublisherMediaType media_type)
+{
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
 #line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = media_type;
-#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->media_type = _tmp0_;
-#line 6366 "PicasaPublishing.c"
+	self->priv->media_type = media_type;
+#line 6418 "PicasaPublishing.c"
 }
 
 
-SpitPublishingPublisherMediaType publishing_picasa_publishing_parameters_get_media_type (PublishingPicasaPublishingParameters* self) {
+SpitPublishingPublisherMediaType
+publishing_picasa_publishing_parameters_get_media_type (PublishingPicasaPublishingParameters* self)
+{
 	SpitPublishingPublisherMediaType result = 0;
 	SpitPublishingPublisherMediaType _tmp0_;
 #line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -6393,108 +6447,133 @@ SpitPublishingPublisherMediaType publishing_picasa_publishing_parameters_get_med
 	result = _tmp0_;
 #line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 6381 "PicasaPublishing.c"
+#line 6435 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_value_publishing_parameters_init (GValue* value) {
+static void
+publishing_picasa_value_publishing_parameters_init (GValue* value)
+{
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 6388 "PicasaPublishing.c"
+#line 6444 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_value_publishing_parameters_free_value (GValue* value) {
+static void
+publishing_picasa_value_publishing_parameters_free_value (GValue* value)
+{
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (value->data[0].v_pointer) {
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_publishing_parameters_unref (value->data[0].v_pointer);
-#line 6397 "PicasaPublishing.c"
+#line 6455 "PicasaPublishing.c"
 	}
 }
 
 
-static void publishing_picasa_value_publishing_parameters_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_picasa_value_publishing_parameters_copy_value (const GValue* src_value,
+                                                          GValue* dest_value)
+{
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (src_value->data[0].v_pointer) {
 #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 6407 "PicasaPublishing.c"
+#line 6468 "PicasaPublishing.c"
 	} else {
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 6411 "PicasaPublishing.c"
+#line 6472 "PicasaPublishing.c"
 	}
 }
 
 
-static gpointer publishing_picasa_value_publishing_parameters_peek_pointer (const GValue* value) {
+static gpointer
+publishing_picasa_value_publishing_parameters_peek_pointer (const GValue* value)
+{
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return value->data[0].v_pointer;
-#line 6419 "PicasaPublishing.c"
+#line 6482 "PicasaPublishing.c"
 }
 
 
-static gchar* publishing_picasa_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_picasa_value_publishing_parameters_collect_value (GValue* value,
+                                                             guint n_collect_values,
+                                                             GTypeCValue* collect_values,
+                                                             guint collect_flags)
+{
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 6426 "PicasaPublishing.c"
+#line 6494 "PicasaPublishing.c"
 		PublishingPicasaPublishingParameters * object;
 		object = collect_values[0].v_pointer;
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #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 6433 "PicasaPublishing.c"
+#line 6501 "PicasaPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #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 6437 "PicasaPublishing.c"
+#line 6505 "PicasaPublishing.c"
 		}
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = publishing_picasa_publishing_parameters_ref (object);
-#line 6441 "PicasaPublishing.c"
+#line 6509 "PicasaPublishing.c"
 	} else {
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 6445 "PicasaPublishing.c"
+#line 6513 "PicasaPublishing.c"
 	}
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return NULL;
-#line 6449 "PicasaPublishing.c"
+#line 6517 "PicasaPublishing.c"
 }
 
 
-static gchar* publishing_picasa_value_publishing_parameters_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+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 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!object_p) {
 #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 6460 "PicasaPublishing.c"
+#line 6533 "PicasaPublishing.c"
 	}
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = NULL;
-#line 6466 "PicasaPublishing.c"
+#line 6539 "PicasaPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 6470 "PicasaPublishing.c"
+#line 6543 "PicasaPublishing.c"
 	} else {
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = publishing_picasa_publishing_parameters_ref (value->data[0].v_pointer);
-#line 6474 "PicasaPublishing.c"
+#line 6547 "PicasaPublishing.c"
 	}
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return NULL;
-#line 6478 "PicasaPublishing.c"
+#line 6551 "PicasaPublishing.c"
 }
 
 
-GParamSpec* publishing_picasa_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_picasa_param_spec_publishing_parameters (const gchar* name,
+                                                    const gchar* nick,
+                                                    const gchar* blurb,
+                                                    GType object_type,
+                                                    GParamFlags flags)
+{
 	PublishingPicasaParamSpecPublishingParameters* spec;
 #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);
@@ -6504,20 +6583,25 @@ GParamSpec* publishing_picasa_param_spec_publishing_parameters (const gchar* nam
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 6492 "PicasaPublishing.c"
+#line 6571 "PicasaPublishing.c"
 }
 
 
-gpointer publishing_picasa_value_get_publishing_parameters (const GValue* value) {
+gpointer
+publishing_picasa_value_get_publishing_parameters (const GValue* value)
+{
 #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 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return value->data[0].v_pointer;
-#line 6501 "PicasaPublishing.c"
+#line 6582 "PicasaPublishing.c"
 }
 
 
-void publishing_picasa_value_set_publishing_parameters (GValue* value, gpointer v_object) {
+void
+publishing_picasa_value_set_publishing_parameters (GValue* value,
+                                                   gpointer v_object)
+{
 	PublishingPicasaPublishingParameters * old;
 #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));
@@ -6533,22 +6617,25 @@ void publishing_picasa_value_set_publishing_parameters (GValue* value, gpointer
 		value->data[0].v_pointer = v_object;
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_publishing_parameters_ref (value->data[0].v_pointer);
-#line 6521 "PicasaPublishing.c"
+#line 6605 "PicasaPublishing.c"
 	} else {
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 6525 "PicasaPublishing.c"
+#line 6609 "PicasaPublishing.c"
 	}
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (old) {
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_publishing_parameters_unref (old);
-#line 6531 "PicasaPublishing.c"
+#line 6615 "PicasaPublishing.c"
 	}
 }
 
 
-void publishing_picasa_value_take_publishing_parameters (GValue* value, gpointer v_object) {
+void
+publishing_picasa_value_take_publishing_parameters (GValue* value,
+                                                    gpointer v_object)
+{
 	PublishingPicasaPublishingParameters * old;
 #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));
@@ -6562,42 +6649,48 @@ void publishing_picasa_value_take_publishing_parameters (GValue* value, gpointer
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 6550 "PicasaPublishing.c"
+#line 6637 "PicasaPublishing.c"
 	} else {
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 6554 "PicasaPublishing.c"
+#line 6641 "PicasaPublishing.c"
 	}
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (old) {
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_publishing_parameters_unref (old);
-#line 6560 "PicasaPublishing.c"
+#line 6647 "PicasaPublishing.c"
 	}
 }
 
 
-static void publishing_picasa_publishing_parameters_class_init (PublishingPicasaPublishingParametersClass * klass) {
+static void
+publishing_picasa_publishing_parameters_class_init (PublishingPicasaPublishingParametersClass * klass)
+{
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_publishing_parameters_parent_class = g_type_class_peek_parent (klass);
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	((PublishingPicasaPublishingParametersClass *) klass)->finalize = publishing_picasa_publishing_parameters_finalize;
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingPicasaPublishingParametersPrivate));
-#line 6572 "PicasaPublishing.c"
+#line 6661 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_publishing_parameters_instance_init (PublishingPicasaPublishingParameters * self) {
+static void
+publishing_picasa_publishing_parameters_instance_init (PublishingPicasaPublishingParameters * self)
+{
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv = PUBLISHING_PICASA_PUBLISHING_PARAMETERS_GET_PRIVATE (self);
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->ref_count = 1;
-#line 6581 "PicasaPublishing.c"
+#line 6672 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_publishing_parameters_finalize (PublishingPicasaPublishingParameters * obj) {
+static void
+publishing_picasa_publishing_parameters_finalize (PublishingPicasaPublishingParameters * obj)
+{
 	PublishingPicasaPublishingParameters * self;
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS, PublishingPicasaPublishingParameters);
@@ -6611,11 +6704,13 @@ static void publishing_picasa_publishing_parameters_finalize (PublishingPicasaPu
 	_g_free0 (self->priv->user_name);
 #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 6599 "PicasaPublishing.c"
+#line 6692 "PicasaPublishing.c"
 }
 
 
-GType publishing_picasa_publishing_parameters_get_type (void) {
+GType
+publishing_picasa_publishing_parameters_get_type (void)
+{
 	static volatile gsize publishing_picasa_publishing_parameters_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_picasa_publishing_parameters_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { publishing_picasa_value_publishing_parameters_init, publishing_picasa_value_publishing_parameters_free_value, publishing_picasa_value_publishing_parameters_copy_value, publishing_picasa_value_publishing_parameters_peek_pointer, "p", publishing_picasa_value_publishing_parameters_collect_value, "p", publishing_picasa_value_publishing_parameters_lcopy_value };
@@ -6629,18 +6724,22 @@ GType publishing_picasa_publishing_parameters_get_type (void) {
 }
 
 
-gpointer publishing_picasa_publishing_parameters_ref (gpointer instance) {
+gpointer
+publishing_picasa_publishing_parameters_ref (gpointer instance)
+{
 	PublishingPicasaPublishingParameters * self;
 	self = instance;
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return instance;
-#line 6624 "PicasaPublishing.c"
+#line 6721 "PicasaPublishing.c"
 }
 
 
-void publishing_picasa_publishing_parameters_unref (gpointer instance) {
+void
+publishing_picasa_publishing_parameters_unref (gpointer instance)
+{
 	PublishingPicasaPublishingParameters * self;
 	self = instance;
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -6649,52 +6748,54 @@ void publishing_picasa_publishing_parameters_unref (gpointer instance) {
 		PUBLISHING_PICASA_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self);
 #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 6637 "PicasaPublishing.c"
+#line 6736 "PicasaPublishing.c"
 	}
 }
 
 
-PublishingPicasaUploader* publishing_picasa_uploader_construct (GType object_type, PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingPicasaPublishingParameters* parameters) {
+PublishingPicasaUploader*
+publishing_picasa_uploader_construct (GType object_type,
+                                      PublishingRESTSupportGoogleSession* session,
+                                      SpitPublishingPublishable** publishables,
+                                      int publishables_length1,
+                                      PublishingPicasaPublishingParameters* parameters)
+{
 	PublishingPicasaUploader* self = NULL;
-	PublishingRESTSupportGoogleSession* _tmp0_;
-	SpitPublishingPublishable** _tmp1_;
-	gint _tmp1__length1;
-	PublishingPicasaPublishingParameters* _tmp2_;
-	PublishingPicasaPublishingParameters* _tmp3_;
+	PublishingPicasaPublishingParameters* _tmp0_;
 #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 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (parameters), NULL);
 #line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = session;
-#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp1_ = publishables;
-#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp1__length1 = publishables_length1;
-#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 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp2_ = parameters;
+	self = (PublishingPicasaUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), publishables, publishables_length1);
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp3_ = _publishing_picasa_publishing_parameters_ref0 (_tmp2_);
+	_tmp0_ = _publishing_picasa_publishing_parameters_ref0 (parameters);
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_picasa_publishing_parameters_unref0 (self->priv->parameters);
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->parameters = _tmp3_;
+	self->priv->parameters = _tmp0_;
 #line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 6671 "PicasaPublishing.c"
+#line 6764 "PicasaPublishing.c"
 }
 
 
-PublishingPicasaUploader* publishing_picasa_uploader_new (PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingPicasaPublishingParameters* parameters) {
+PublishingPicasaUploader*
+publishing_picasa_uploader_new (PublishingRESTSupportGoogleSession* session,
+                                SpitPublishingPublishable** publishables,
+                                int publishables_length1,
+                                PublishingPicasaPublishingParameters* parameters)
+{
 #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 6678 "PicasaPublishing.c"
+#line 6776 "PicasaPublishing.c"
 }
 
 
-static PublishingRESTSupportTransaction* publishing_picasa_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable) {
+static PublishingRESTSupportTransaction*
+publishing_picasa_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base,
+                                                    SpitPublishingPublishable* publishable)
+{
 	PublishingPicasaUploader * self;
 	PublishingRESTSupportTransaction* result = NULL;
 	PublishingRESTSupportSession* _tmp0_;
@@ -6730,11 +6831,13 @@ static PublishingRESTSupportTransaction* publishing_picasa_uploader_real_create_
 	result = _tmp6_;
 #line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 6718 "PicasaPublishing.c"
+#line 6819 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_uploader_class_init (PublishingPicasaUploaderClass * klass) {
+static void
+publishing_picasa_uploader_class_init (PublishingPicasaUploaderClass * klass)
+{
 #line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_uploader_parent_class = g_type_class_peek_parent (klass);
 #line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -6743,18 +6846,22 @@ static void publishing_picasa_uploader_class_init (PublishingPicasaUploaderClass
 	g_type_class_add_private (klass, sizeof (PublishingPicasaUploaderPrivate));
 #line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_picasa_uploader_real_create_transaction;
-#line 6731 "PicasaPublishing.c"
+#line 6834 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_uploader_instance_init (PublishingPicasaUploader * self) {
+static void
+publishing_picasa_uploader_instance_init (PublishingPicasaUploader * self)
+{
 #line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv = PUBLISHING_PICASA_UPLOADER_GET_PRIVATE (self);
-#line 6738 "PicasaPublishing.c"
+#line 6843 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_uploader_finalize (PublishingRESTSupportBatchUploader * obj) {
+static void
+publishing_picasa_uploader_finalize (PublishingRESTSupportBatchUploader * obj)
+{
 	PublishingPicasaUploader * self;
 #line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PICASA_TYPE_UPLOADER, PublishingPicasaUploader);
@@ -6762,11 +6869,13 @@ static void publishing_picasa_uploader_finalize (PublishingRESTSupportBatchUploa
 	_publishing_picasa_publishing_parameters_unref0 (self->priv->parameters);
 #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 6750 "PicasaPublishing.c"
+#line 6857 "PicasaPublishing.c"
 }
 
 
-GType publishing_picasa_uploader_get_type (void) {
+GType
+publishing_picasa_uploader_get_type (void)
+{
 	static volatile gsize publishing_picasa_uploader_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_picasa_uploader_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingPicasaUploaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_picasa_uploader_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPicasaUploader), 0, (GInstanceInitFunc) publishing_picasa_uploader_instance_init, NULL };
@@ -6778,7 +6887,11 @@ GType publishing_picasa_uploader_get_type (void) {
 }
 
 
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_destroy (gpointer array,
+                     gint array_length,
+                     GDestroyNotify destroy_func)
+{
 	if ((array != NULL) && (destroy_func != NULL)) {
 		int i;
 		for (i = 0; i < array_length; i = i + 1) {
@@ -6790,13 +6903,19 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti
 }
 
 
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_free (gpointer array,
+                  gint array_length,
+                  GDestroyNotify destroy_func)
+{
 	_vala_array_destroy (array, array_length, destroy_func);
 	g_free (array);
 }
 
 
-static gint _vala_array_length (gpointer array) {
+static gint
+_vala_array_length (gpointer array)
+{
 	int length;
 	length = 0;
 	if (array) {
diff --git a/plugins/shotwell-publishing/PiwigoPublishing.c b/plugins/shotwell-publishing/PiwigoPublishing.c
index 2323b7f..e066269 100644
--- a/plugins/shotwell-publishing/PiwigoPublishing.c
+++ b/plugins/shotwell-publishing/PiwigoPublishing.c
@@ -1,4 +1,4 @@
-/* PiwigoPublishing.c generated by valac 0.36.6, the Vala compiler
+/* PiwigoPublishing.c generated by valac 0.40.4, the Vala compiler
  * generated from PiwigoPublishing.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <shotwell-plugin-dev-1.0.h>
@@ -37,6 +38,11 @@
 typedef struct _PiwigoService PiwigoService;
 typedef struct _PiwigoServiceClass PiwigoServiceClass;
 typedef struct _PiwigoServicePrivate PiwigoServicePrivate;
+enum  {
+	PIWIGO_SERVICE_0_PROPERTY,
+	PIWIGO_SERVICE_NUM_PROPERTIES
+};
+static GParamSpec* piwigo_service_properties[PIWIGO_SERVICE_NUM_PROPERTIES];
 #define _g_free0(var) (var = (g_free (var), NULL))
 
 #define PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER (publishing_piwigo_piwigo_publisher_get_type ())
@@ -110,6 +116,11 @@ typedef struct _PublishingPiwigoPiwigoPublisherPrivate PublishingPiwigoPiwigoPub
 
 typedef struct _PublishingPiwigoSession PublishingPiwigoSession;
 typedef struct _PublishingPiwigoSessionClass PublishingPiwigoSessionClass;
+enum  {
+	PUBLISHING_PIWIGO_PIWIGO_PUBLISHER_0_PROPERTY,
+	PUBLISHING_PIWIGO_PIWIGO_PUBLISHER_NUM_PROPERTIES
+};
+static GParamSpec* publishing_piwigo_piwigo_publisher_properties[PUBLISHING_PIWIGO_PIWIGO_PUBLISHER_NUM_PROPERTIES];
 #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_piwigo_publishing_parameters_unref0(var) ((var == NULL) ? NULL : (var = (publishing_piwigo_publishing_parameters_unref (var), NULL)))
@@ -235,25 +246,53 @@ typedef struct _PublishingPiwigoUploaderPrivate PublishingPiwigoUploaderPrivate;
 typedef struct _PublishingPiwigoImagesAddTransaction PublishingPiwigoImagesAddTransaction;
 typedef struct _PublishingPiwigoImagesAddTransactionClass PublishingPiwigoImagesAddTransactionClass;
 typedef struct _PublishingPiwigoSSLErrorPanePrivate PublishingPiwigoSSLErrorPanePrivate;
+enum  {
+	PUBLISHING_PIWIGO_SSL_ERROR_PANE_0_PROPERTY,
+	PUBLISHING_PIWIGO_SSL_ERROR_PANE_HOST_PROPERTY,
+	PUBLISHING_PIWIGO_SSL_ERROR_PANE_CERT_PROPERTY,
+	PUBLISHING_PIWIGO_SSL_ERROR_PANE_ERROR_TEXT_PROPERTY,
+	PUBLISHING_PIWIGO_SSL_ERROR_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_piwigo_ssl_error_pane_properties[PUBLISHING_PIWIGO_SSL_ERROR_PANE_NUM_PROPERTIES];
 #define _g_byte_array_unref0(var) ((var == NULL) ? NULL : (var = (g_byte_array_unref (var), NULL)))
 enum  {
 	PUBLISHING_PIWIGO_SSL_ERROR_PANE_PROCEED_SIGNAL,
-	PUBLISHING_PIWIGO_SSL_ERROR_PANE_LAST_SIGNAL
+	PUBLISHING_PIWIGO_SSL_ERROR_PANE_NUM_SIGNALS
 };
-static guint publishing_piwigo_ssl_error_pane_signals[PUBLISHING_PIWIGO_SSL_ERROR_PANE_LAST_SIGNAL] = {0};
+static guint publishing_piwigo_ssl_error_pane_signals[PUBLISHING_PIWIGO_SSL_ERROR_PANE_NUM_SIGNALS] = {0};
 typedef struct _PublishingPiwigoAuthenticationPanePrivate PublishingPiwigoAuthenticationPanePrivate;
 enum  {
+	PUBLISHING_PIWIGO_AUTHENTICATION_PANE_0_PROPERTY,
+	PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_PROPERTY,
+	PUBLISHING_PIWIGO_AUTHENTICATION_PANE_PUBLISHER_PROPERTY,
+	PUBLISHING_PIWIGO_AUTHENTICATION_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_piwigo_authentication_pane_properties[PUBLISHING_PIWIGO_AUTHENTICATION_PANE_NUM_PROPERTIES];
+enum  {
 	PUBLISHING_PIWIGO_AUTHENTICATION_PANE_LOGIN_SIGNAL,
-	PUBLISHING_PIWIGO_AUTHENTICATION_PANE_LAST_SIGNAL
+	PUBLISHING_PIWIGO_AUTHENTICATION_PANE_NUM_SIGNALS
 };
-static guint publishing_piwigo_authentication_pane_signals[PUBLISHING_PIWIGO_AUTHENTICATION_PANE_LAST_SIGNAL] = {0};
+static guint publishing_piwigo_authentication_pane_signals[PUBLISHING_PIWIGO_AUTHENTICATION_PANE_NUM_SIGNALS] = {0};
 typedef struct _PublishingPiwigoPublishingOptionsPanePrivate PublishingPiwigoPublishingOptionsPanePrivate;
 enum  {
+	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_0_PROPERTY,
+	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_CATEGORY_PROPERTY,
+	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PERMISSION_LEVEL_PROPERTY,
+	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PHOTO_SIZE_PROPERTY,
+	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_TITLE_AS_COMMENT_PROPERTY,
+	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_NO_UPLOAD_TAGS_PROPERTY,
+	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_STRIP_METADATA_ENABLED_PROPERTY,
+	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_EXISTING_CATEGORIES_PROPERTY,
+	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DEFAULT_COMMENT_PROPERTY,
+	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_piwigo_publishing_options_pane_properties[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_NUM_PROPERTIES];
+enum  {
 	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL,
 	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL,
-	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL
+	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_NUM_SIGNALS
 };
-static guint publishing_piwigo_publishing_options_pane_signals[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0};
+static guint publishing_piwigo_publishing_options_pane_signals[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_NUM_SIGNALS] = {0};
 typedef struct _PublishingPiwigoSessionPrivate PublishingPiwigoSessionPrivate;
 typedef struct _PublishingPiwigoTransactionPrivate PublishingPiwigoTransactionPrivate;
 typedef struct _PublishingPiwigoSessionLoginTransactionPrivate PublishingPiwigoSessionLoginTransactionPrivate;
@@ -589,21 +628,28 @@ static gpointer publishing_piwigo_categories_add_transaction_parent_class = NULL
 static gpointer publishing_piwigo_images_add_transaction_parent_class = NULL;
 
 GType piwigo_service_get_type (void) G_GNUC_CONST;
-enum  {
-	PIWIGO_SERVICE_DUMMY_PROPERTY
-};
 #define PIWIGO_SERVICE_ICON_FILENAME "piwigo.png"
 PiwigoService* piwigo_service_new (GFile* resource_directory);
-PiwigoService* piwigo_service_construct (GType object_type, GFile* resource_directory);
-static gint piwigo_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface);
+PiwigoService* piwigo_service_construct (GType object_type,
+                                         GFile* resource_directory);
+static gint piwigo_service_real_get_pluggable_interface (SpitPluggable* base,
+                                                  gint min_host_interface,
+                                                  gint max_host_interface);
 static const gchar* piwigo_service_real_get_id (SpitPluggable* base);
 static const gchar* piwigo_service_real_get_pluggable_name (SpitPluggable* base);
-static void piwigo_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info);
-static GdkPixbuf** _vala_array_dup10 (GdkPixbuf** self, int length);
-static void piwigo_service_real_activation (SpitPluggable* base, gboolean enabled);
-static SpitPublishingPublisher* piwigo_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host);
-PublishingPiwigoPiwigoPublisher* publishing_piwigo_piwigo_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host);
-PublishingPiwigoPiwigoPublisher* publishing_piwigo_piwigo_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host);
+static void piwigo_service_real_get_info (SpitPluggable* base,
+                                   SpitPluggableInfo* info);
+static GdkPixbuf** _vala_array_dup12 (GdkPixbuf** self,
+                               int length);
+static void piwigo_service_real_activation (SpitPluggable* base,
+                                     gboolean enabled);
+static SpitPublishingPublisher* piwigo_service_real_create_publisher (SpitPublishingService* base,
+                                                               SpitPublishingPluginHost* host);
+PublishingPiwigoPiwigoPublisher* publishing_piwigo_piwigo_publisher_new (SpitPublishingService* service,
+                                                                         SpitPublishingPluginHost* host);
+PublishingPiwigoPiwigoPublisher* publishing_piwigo_piwigo_publisher_construct (GType object_type,
+                                                                               SpitPublishingService* service,
+                                                                               SpitPublishingPluginHost* host);
 GType publishing_piwigo_piwigo_publisher_get_type (void) G_GNUC_CONST;
 static SpitPublishingPublisherMediaType piwigo_service_real_get_supported_media (SpitPublishingService* base);
 static void piwigo_service_finalize (GObject * obj);
@@ -612,66 +658,94 @@ static void piwigo_service_finalize (GObject * obj);
 #define PUBLISHING_PIWIGO_ORIGINAL_SIZE -1
 gpointer publishing_piwigo_category_ref (gpointer instance);
 void publishing_piwigo_category_unref (gpointer instance);
-GParamSpec* publishing_piwigo_param_spec_category (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_piwigo_value_set_category (GValue* value, gpointer v_object);
-void publishing_piwigo_value_take_category (GValue* value, gpointer v_object);
+GParamSpec* publishing_piwigo_param_spec_category (const gchar* name,
+                                                   const gchar* nick,
+                                                   const gchar* blurb,
+                                                   GType object_type,
+                                                   GParamFlags flags);
+void publishing_piwigo_value_set_category (GValue* value,
+                                           gpointer v_object);
+void publishing_piwigo_value_take_category (GValue* value,
+                                            gpointer v_object);
 gpointer publishing_piwigo_value_get_category (const GValue* value);
 GType publishing_piwigo_category_get_type (void) G_GNUC_CONST;
-enum  {
-	PUBLISHING_PIWIGO_CATEGORY_DUMMY_PROPERTY
-};
 #define PUBLISHING_PIWIGO_CATEGORY_NO_ID -1
-PublishingPiwigoCategory* publishing_piwigo_category_new (gint id, const gchar* name, const gchar* uppercats, const gchar* comment);
-PublishingPiwigoCategory* publishing_piwigo_category_construct (GType object_type, gint id, const gchar* name, const gchar* uppercats, const gchar* comment);
-PublishingPiwigoCategory* publishing_piwigo_category_new_local (const gchar* name, gint parent_id, const gchar* comment);
-PublishingPiwigoCategory* publishing_piwigo_category_construct_local (GType object_type, const gchar* name, gint parent_id, const gchar* comment);
+PublishingPiwigoCategory* publishing_piwigo_category_new (gint id,
+                                                          const gchar* name,
+                                                          const gchar* uppercats,
+                                                          const gchar* comment);
+PublishingPiwigoCategory* publishing_piwigo_category_construct (GType object_type,
+                                                                gint id,
+                                                                const gchar* name,
+                                                                const gchar* uppercats,
+                                                                const gchar* comment);
+PublishingPiwigoCategory* publishing_piwigo_category_new_local (const gchar* name,
+                                                                gint parent_id,
+                                                                const gchar* comment);
+PublishingPiwigoCategory* publishing_piwigo_category_construct_local (GType object_type,
+                                                                      const gchar* name,
+                                                                      gint parent_id,
+                                                                      const gchar* comment);
 gboolean publishing_piwigo_category_is_local (PublishingPiwigoCategory* self);
-gboolean publishing_piwigo_category_equal (PublishingPiwigoCategory* _self_, PublishingPiwigoCategory* other);
+gboolean publishing_piwigo_category_equal (PublishingPiwigoCategory* _self_,
+                                           PublishingPiwigoCategory* other);
 static void publishing_piwigo_category_finalize (PublishingPiwigoCategory * obj);
 gpointer publishing_piwigo_permission_level_ref (gpointer instance);
 void publishing_piwigo_permission_level_unref (gpointer instance);
-GParamSpec* publishing_piwigo_param_spec_permission_level (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_piwigo_value_set_permission_level (GValue* value, gpointer v_object);
-void publishing_piwigo_value_take_permission_level (GValue* value, gpointer v_object);
+GParamSpec* publishing_piwigo_param_spec_permission_level (const gchar* name,
+                                                           const gchar* nick,
+                                                           const gchar* blurb,
+                                                           GType object_type,
+                                                           GParamFlags flags);
+void publishing_piwigo_value_set_permission_level (GValue* value,
+                                                   gpointer v_object);
+void publishing_piwigo_value_take_permission_level (GValue* value,
+                                                    gpointer v_object);
 gpointer publishing_piwigo_value_get_permission_level (const GValue* value);
 GType publishing_piwigo_permission_level_get_type (void) G_GNUC_CONST;
-enum  {
-	PUBLISHING_PIWIGO_PERMISSION_LEVEL_DUMMY_PROPERTY
-};
-PublishingPiwigoPermissionLevel* publishing_piwigo_permission_level_new (gint id, const gchar* name);
-PublishingPiwigoPermissionLevel* publishing_piwigo_permission_level_construct (GType object_type, gint id, const gchar* name);
+PublishingPiwigoPermissionLevel* publishing_piwigo_permission_level_new (gint id,
+                                                                         const gchar* name);
+PublishingPiwigoPermissionLevel* publishing_piwigo_permission_level_construct (GType object_type,
+                                                                               gint id,
+                                                                               const gchar* name);
 static void publishing_piwigo_permission_level_finalize (PublishingPiwigoPermissionLevel * obj);
 gpointer publishing_piwigo_size_entry_ref (gpointer instance);
 void publishing_piwigo_size_entry_unref (gpointer instance);
-GParamSpec* publishing_piwigo_param_spec_size_entry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_piwigo_value_set_size_entry (GValue* value, gpointer v_object);
-void publishing_piwigo_value_take_size_entry (GValue* value, gpointer v_object);
+GParamSpec* publishing_piwigo_param_spec_size_entry (const gchar* name,
+                                                     const gchar* nick,
+                                                     const gchar* blurb,
+                                                     GType object_type,
+                                                     GParamFlags flags);
+void publishing_piwigo_value_set_size_entry (GValue* value,
+                                             gpointer v_object);
+void publishing_piwigo_value_take_size_entry (GValue* value,
+                                              gpointer v_object);
 gpointer publishing_piwigo_value_get_size_entry (const GValue* value);
 GType publishing_piwigo_size_entry_get_type (void) G_GNUC_CONST;
-enum  {
-	PUBLISHING_PIWIGO_SIZE_ENTRY_DUMMY_PROPERTY
-};
-PublishingPiwigoSizeEntry* publishing_piwigo_size_entry_new (gint id, const gchar* name);
-PublishingPiwigoSizeEntry* publishing_piwigo_size_entry_construct (GType object_type, gint id, const gchar* name);
+PublishingPiwigoSizeEntry* publishing_piwigo_size_entry_new (gint id,
+                                                             const gchar* name);
+PublishingPiwigoSizeEntry* publishing_piwigo_size_entry_construct (GType object_type,
+                                                                   gint id,
+                                                                   const gchar* name);
 static void publishing_piwigo_size_entry_finalize (PublishingPiwigoSizeEntry * obj);
 gpointer publishing_piwigo_publishing_parameters_ref (gpointer instance);
 void publishing_piwigo_publishing_parameters_unref (gpointer instance);
-GParamSpec* publishing_piwigo_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_piwigo_value_set_publishing_parameters (GValue* value, gpointer v_object);
-void publishing_piwigo_value_take_publishing_parameters (GValue* value, gpointer v_object);
+GParamSpec* publishing_piwigo_param_spec_publishing_parameters (const gchar* name,
+                                                                const gchar* nick,
+                                                                const gchar* blurb,
+                                                                GType object_type,
+                                                                GParamFlags flags);
+void publishing_piwigo_value_set_publishing_parameters (GValue* value,
+                                                        gpointer v_object);
+void publishing_piwigo_value_take_publishing_parameters (GValue* value,
+                                                         gpointer v_object);
 gpointer publishing_piwigo_value_get_publishing_parameters (const GValue* value);
 GType publishing_piwigo_publishing_parameters_get_type (void) G_GNUC_CONST;
-enum  {
-	PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_DUMMY_PROPERTY
-};
 PublishingPiwigoPublishingParameters* publishing_piwigo_publishing_parameters_new (void);
 PublishingPiwigoPublishingParameters* publishing_piwigo_publishing_parameters_construct (GType object_type);
 static void publishing_piwigo_publishing_parameters_finalize (PublishingPiwigoPublishingParameters * obj);
 GType publishing_piwigo_session_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_PIWIGO_PIWIGO_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, PublishingPiwigoPiwigoPublisherPrivate))
-enum  {
-	PUBLISHING_PIWIGO_PIWIGO_PUBLISHER_DUMMY_PROPERTY
-};
 PublishingPiwigoSession* publishing_piwigo_session_new (void);
 PublishingPiwigoSession* publishing_piwigo_session_construct (GType object_type);
 static SpitPublishingService* publishing_piwigo_piwigo_publisher_real_get_service (SpitPublishingPublisher* base);
@@ -682,286 +756,492 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi
 gchar* publishing_piwigo_piwigo_publisher_get_persistent_url (PublishingPiwigoPiwigoPublisher* self);
 gchar* publishing_piwigo_piwigo_publisher_get_persistent_username (PublishingPiwigoPiwigoPublisher* self);
 gchar* publishing_piwigo_piwigo_publisher_get_persistent_password (PublishingPiwigoPiwigoPublisher* self);
-static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwigoPiwigoPublisher* self, const gchar* url, const gchar* username, const gchar* password, gboolean remember_password);
+static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwigoPiwigoPublisher* self,
+                                                          const gchar* url,
+                                                          const gchar* username,
+                                                          const gchar* password,
+                                                          gboolean remember_password);
 gboolean publishing_piwigo_piwigo_publisher_get_remember_password (PublishingPiwigoPiwigoPublisher* self);
 GType publishing_piwigo_authentication_pane_mode_get_type (void) G_GNUC_CONST;
-static void publishing_piwigo_piwigo_publisher_do_show_authentication_pane (PublishingPiwigoPiwigoPublisher* self, PublishingPiwigoAuthenticationPaneMode mode);
+static void publishing_piwigo_piwigo_publisher_do_show_authentication_pane (PublishingPiwigoPiwigoPublisher* self,
+                                                                     PublishingPiwigoAuthenticationPaneMode mode);
 static void publishing_piwigo_piwigo_publisher_real_stop (SpitPublishingPublisher* base);
-static void publishing_piwigo_piwigo_publisher_set_persistent_url (PublishingPiwigoPiwigoPublisher* self, const gchar* url);
-static void publishing_piwigo_piwigo_publisher_set_persistent_username (PublishingPiwigoPiwigoPublisher* self, const gchar* username);
-static void publishing_piwigo_piwigo_publisher_set_persistent_password (PublishingPiwigoPiwigoPublisher* self, const gchar* password);
-static void publishing_piwigo_piwigo_publisher_set_remember_password (PublishingPiwigoPiwigoPublisher* self, gboolean remember_password);
+static void publishing_piwigo_piwigo_publisher_set_persistent_url (PublishingPiwigoPiwigoPublisher* self,
+                                                            const gchar* url);
+static void publishing_piwigo_piwigo_publisher_set_persistent_username (PublishingPiwigoPiwigoPublisher* self,
+                                                                 const gchar* username);
+static void publishing_piwigo_piwigo_publisher_set_persistent_password (PublishingPiwigoPiwigoPublisher* self,
+                                                                 const gchar* password);
+static void publishing_piwigo_piwigo_publisher_set_remember_password (PublishingPiwigoPiwigoPublisher* self,
+                                                               gboolean remember_password);
 gint publishing_piwigo_piwigo_publisher_get_last_category (PublishingPiwigoPiwigoPublisher* self);
-static void publishing_piwigo_piwigo_publisher_set_last_category (PublishingPiwigoPiwigoPublisher* self, gint last_category);
+static void publishing_piwigo_piwigo_publisher_set_last_category (PublishingPiwigoPiwigoPublisher* self,
+                                                           gint last_category);
 gint publishing_piwigo_piwigo_publisher_get_last_permission_level (PublishingPiwigoPiwigoPublisher* self);
-static void publishing_piwigo_piwigo_publisher_set_last_permission_level (PublishingPiwigoPiwigoPublisher* self, gint last_permission_level);
+static void publishing_piwigo_piwigo_publisher_set_last_permission_level (PublishingPiwigoPiwigoPublisher* self,
+                                                                   gint last_permission_level);
 gint publishing_piwigo_piwigo_publisher_get_last_photo_size (PublishingPiwigoPiwigoPublisher* self);
-static void publishing_piwigo_piwigo_publisher_set_last_photo_size (PublishingPiwigoPiwigoPublisher* self, gint last_photo_size);
+static void publishing_piwigo_piwigo_publisher_set_last_photo_size (PublishingPiwigoPiwigoPublisher* self,
+                                                             gint last_photo_size);
 static gboolean publishing_piwigo_piwigo_publisher_get_last_title_as_comment (PublishingPiwigoPiwigoPublisher* self);
-static void publishing_piwigo_piwigo_publisher_set_last_title_as_comment (PublishingPiwigoPiwigoPublisher* self, gboolean title_as_comment);
+static void publishing_piwigo_piwigo_publisher_set_last_title_as_comment (PublishingPiwigoPiwigoPublisher* self,
+                                                                   gboolean title_as_comment);
 static gboolean publishing_piwigo_piwigo_publisher_get_last_no_upload_tags (PublishingPiwigoPiwigoPublisher* self);
-static void publishing_piwigo_piwigo_publisher_set_last_no_upload_tags (PublishingPiwigoPiwigoPublisher* self, gboolean no_upload_tags);
+static void publishing_piwigo_piwigo_publisher_set_last_no_upload_tags (PublishingPiwigoPiwigoPublisher* self,
+                                                                 gboolean no_upload_tags);
 static gboolean publishing_piwigo_piwigo_publisher_get_metadata_removal_choice (PublishingPiwigoPiwigoPublisher* self);
-static void publishing_piwigo_piwigo_publisher_set_metadata_removal_choice (PublishingPiwigoPiwigoPublisher* self, gboolean strip_metadata);
+static void publishing_piwigo_piwigo_publisher_set_metadata_removal_choice (PublishingPiwigoPiwigoPublisher* self,
+                                                                     gboolean strip_metadata);
 GType publishing_piwigo_authentication_pane_get_type (void) G_GNUC_CONST;
-PublishingPiwigoAuthenticationPane* publishing_piwigo_authentication_pane_new (PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoAuthenticationPaneMode mode);
-PublishingPiwigoAuthenticationPane* publishing_piwigo_authentication_pane_construct (GType object_type, PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoAuthenticationPaneMode mode);
-static void publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clicked (PublishingPiwigoPiwigoPublisher* self, const gchar* url, const gchar* username, const gchar* password, gboolean remember_password);
-static void _publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clicked_publishing_piwigo_authentication_pane_login (PublishingPiwigoAuthenticationPane* _sender, const gchar* url, const gchar* user, const gchar* password, gboolean remember_password, gpointer self);
+PublishingPiwigoAuthenticationPane* publishing_piwigo_authentication_pane_new (PublishingPiwigoPiwigoPublisher* publisher,
+                                                                               PublishingPiwigoAuthenticationPaneMode mode);
+PublishingPiwigoAuthenticationPane* publishing_piwigo_authentication_pane_construct (GType object_type,
+                                                                                     PublishingPiwigoPiwigoPublisher* publisher,
+                                                                                     PublishingPiwigoAuthenticationPaneMode mode);
+static void publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clicked (PublishingPiwigoPiwigoPublisher* self,
+                                                                              const gchar* url,
+                                                                              const gchar* username,
+                                                                              const gchar* password,
+                                                                              gboolean remember_password);
+static void _publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clicked_publishing_piwigo_authentication_pane_login (PublishingPiwigoAuthenticationPane* _sender,
+                                                                                                                           const gchar* url,
+                                                                                                                           const gchar* user,
+                                                                                                                           const gchar* password,
+                                                                                                                           gboolean remember_password,
+                                                                                                                           gpointer self);
 GType publishing_piwigo_transaction_get_type (void) G_GNUC_CONST;
 GType publishing_piwigo_session_login_transaction_get_type (void) G_GNUC_CONST;
-static void publishing_piwigo_piwigo_publisher_do_show_ssl_downgrade_pane (PublishingPiwigoPiwigoPublisher* self, PublishingPiwigoSessionLoginTransaction* trans, const gchar* url);
+static void publishing_piwigo_piwigo_publisher_do_show_ssl_downgrade_pane (PublishingPiwigoPiwigoPublisher* self,
+                                                                    PublishingPiwigoSessionLoginTransaction* trans,
+                                                                    const gchar* url);
 GType publishing_piwigo_ssl_error_pane_get_type (void) G_GNUC_CONST;
-PublishingPiwigoSSLErrorPane* publishing_piwigo_ssl_error_pane_new (PublishingPiwigoSessionLoginTransaction* transaction, const gchar* host);
-PublishingPiwigoSSLErrorPane* publishing_piwigo_ssl_error_pane_construct (GType object_type, PublishingPiwigoSessionLoginTransaction* transaction, const gchar* host);
+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 __lambda7_ (PublishingPiwigoPiwigoPublisher* self);
-static void ___lambda7__publishing_piwigo_ssl_error_pane_proceed (PublishingPiwigoSSLErrorPane* _sender, gpointer 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);
-PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_construct (GType object_type, PublishingPiwigoSession* session, const gchar* url, const gchar* username, const gchar* password);
-static void publishing_piwigo_piwigo_publisher_on_login_network_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err);
-static void _publishing_piwigo_piwigo_publisher_on_login_network_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_piwigo_piwigo_publisher_on_login_network_complete (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_piwigo_piwigo_publisher_on_login_network_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_piwigo_piwigo_publisher_do_show_error (PublishingPiwigoPiwigoPublisher* self, GError* e);
+PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_new (PublishingPiwigoSession* session,
+                                                                                          const gchar* url,
+                                                                                          const gchar* username,
+                                                                                          const gchar* password);
+PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_construct (GType object_type,
+                                                                                                PublishingPiwigoSession* session,
+                                                                                                const gchar* url,
+                                                                                                const gchar* username,
+                                                                                                const gchar* password);
+static void publishing_piwigo_piwigo_publisher_on_login_network_error (PublishingPiwigoPiwigoPublisher* self,
+                                                                PublishingRESTSupportTransaction* bad_txn,
+                                                                GError* err);
+static void _publishing_piwigo_piwigo_publisher_on_login_network_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                                   GError* err,
+                                                                                                                   gpointer self);
+static void publishing_piwigo_piwigo_publisher_on_login_network_complete (PublishingPiwigoPiwigoPublisher* self,
+                                                                   PublishingRESTSupportTransaction* txn);
+static void _publishing_piwigo_piwigo_publisher_on_login_network_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                                  gpointer self);
+static void publishing_piwigo_piwigo_publisher_do_show_error (PublishingPiwigoPiwigoPublisher* self,
+                                                       GError* e);
 gchar* publishing_piwigo_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc);
-static gchar* _publishing_piwigo_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self);
+static gchar* _publishing_piwigo_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc,
+                                                                                                                  gpointer self);
 gchar* publishing_piwigo_transaction_get_error_code (PublishingRESTSupportXmlDocument* doc);
-static gchar* _publishing_piwigo_transaction_get_error_code_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self);
-static gchar* publishing_piwigo_piwigo_publisher_get_pwg_id_from_transaction (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* txn);
-void publishing_piwigo_session_set_pwg_id (PublishingPiwigoSession* self, const gchar* id);
-static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (PublishingPiwigoPiwigoPublisher* self, const gchar* url, const gchar* pwg_id);
+static gchar* _publishing_piwigo_transaction_get_error_code_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc,
+                                                                                                                    gpointer self);
+static gchar* publishing_piwigo_piwigo_publisher_get_pwg_id_from_transaction (PublishingPiwigoPiwigoPublisher* self,
+                                                                       PublishingRESTSupportTransaction* txn);
+void publishing_piwigo_session_set_pwg_id (PublishingPiwigoSession* self,
+                                           const gchar* id);
+static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (PublishingPiwigoPiwigoPublisher* self,
+                                                                 const gchar* url,
+                                                                 const gchar* pwg_id);
 GType publishing_piwigo_session_get_status_transaction_get_type (void) G_GNUC_CONST;
-PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_new_unauthenticated (PublishingPiwigoSession* session, const gchar* url, const gchar* pwg_id);
-PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_construct_unauthenticated (GType object_type, PublishingPiwigoSession* session, const gchar* url, const gchar* pwg_id);
-static void publishing_piwigo_piwigo_publisher_on_session_get_status_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err);
-static void _publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
+PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_new_unauthenticated (PublishingPiwigoSession* session,
+                                                                                                                   const gchar* url,
+                                                                                                                   const gchar* pwg_id);
+PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_construct_unauthenticated (GType object_type,
+                                                                                                                         PublishingPiwigoSession* session,
+                                                                                                                         const gchar* url,
+                                                                                                                         const gchar* pwg_id);
+static void publishing_piwigo_piwigo_publisher_on_session_get_status_error (PublishingPiwigoPiwigoPublisher* self,
+                                                                     PublishingRESTSupportTransaction* bad_txn,
+                                                                     GError* err);
+static void _publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                                        GError* err,
+                                                                                                                        gpointer self);
+static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (PublishingPiwigoPiwigoPublisher* self,
+                                                                        PublishingRESTSupportTransaction* txn);
+static void _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                                       gpointer self);
 PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_new (PublishingPiwigoSession* session);
-PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_construct (GType object_type, PublishingPiwigoSession* session);
+PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_construct (GType object_type,
+                                                                                                         PublishingPiwigoSession* session);
 gchar* publishing_piwigo_session_get_pwg_id (PublishingPiwigoSession* self);
-void publishing_piwigo_session_authenticate (PublishingPiwigoSession* self, const gchar* url, const gchar* username, const gchar* id);
+void publishing_piwigo_session_authenticate (PublishingPiwigoSession* self,
+                                             const gchar* url,
+                                             const gchar* username,
+                                             const gchar* id);
 gchar* publishing_piwigo_session_get_pwg_url (PublishingPiwigoSession* self);
 gchar* publishing_piwigo_session_get_username (PublishingPiwigoSession* self);
-static void publishing_piwigo_piwigo_publisher_on_network_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err);
+static void publishing_piwigo_piwigo_publisher_on_network_error (PublishingPiwigoPiwigoPublisher* self,
+                                                          PublishingRESTSupportTransaction* bad_txn,
+                                                          GError* err);
 GType publishing_piwigo_categories_get_list_transaction_get_type (void) G_GNUC_CONST;
 PublishingPiwigoCategoriesGetListTransaction* publishing_piwigo_categories_get_list_transaction_new (PublishingPiwigoSession* session);
-PublishingPiwigoCategoriesGetListTransaction* publishing_piwigo_categories_get_list_transaction_construct (GType object_type, PublishingPiwigoSession* session);
-static void publishing_piwigo_piwigo_publisher_on_category_fetch_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err);
-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_add35 (PublishingPiwigoCategory** * array, int* length, int* size, PublishingPiwigoCategory* value);
+PublishingPiwigoCategoriesGetListTransaction* publishing_piwigo_categories_get_list_transaction_construct (GType object_type,
+                                                                                                           PublishingPiwigoSession* session);
+static void publishing_piwigo_piwigo_publisher_on_category_fetch_error (PublishingPiwigoPiwigoPublisher* self,
+                                                                 PublishingRESTSupportTransaction* bad_txn,
+                                                                 GError* err);
+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_add38 (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);
-PublishingPiwigoPublishingOptionsPane* publishing_piwigo_publishing_options_pane_construct (GType object_type, 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);
+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);
+PublishingPiwigoPublishingOptionsPane* publishing_piwigo_publishing_options_pane_construct (GType object_type,
+                                                                                            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);
 static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout_clicked (PublishingPiwigoPiwigoPublisher* self);
-static void _publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout_clicked_publishing_piwigo_publishing_options_pane_logout (PublishingPiwigoPublishingOptionsPane* _sender, gpointer self);
-static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publish_clicked (PublishingPiwigoPiwigoPublisher* self, PublishingPiwigoPublishingParameters* parameters, gboolean strip_metadata);
-static void _publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publish_clicked_publishing_piwigo_publishing_options_pane_publish (PublishingPiwigoPublishingOptionsPane* _sender, PublishingPiwigoPublishingParameters* parameters, gboolean strip_metadata, gpointer self);
+static void _publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout_clicked_publishing_piwigo_publishing_options_pane_logout (PublishingPiwigoPublishingOptionsPane* _sender,
+                                                                                                                                     gpointer self);
+static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publish_clicked (PublishingPiwigoPiwigoPublisher* self,
+                                                                                    PublishingPiwigoPublishingParameters* parameters,
+                                                                                    gboolean strip_metadata);
+static void _publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publish_clicked_publishing_piwigo_publishing_options_pane_publish (PublishingPiwigoPublishingOptionsPane* _sender,
+                                                                                                                                       PublishingPiwigoPublishingParameters* parameters,
+                                                                                                                                       gboolean strip_metadata,
+                                                                                                                                       gpointer self);
 GType publishing_piwigo_session_logout_transaction_get_type (void) G_GNUC_CONST;
 PublishingPiwigoSessionLogoutTransaction* publishing_piwigo_session_logout_transaction_new (PublishingPiwigoSession* session);
-PublishingPiwigoSessionLogoutTransaction* publishing_piwigo_session_logout_transaction_construct (GType object_type, PublishingPiwigoSession* session);
-static void publishing_piwigo_piwigo_publisher_on_logout_network_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err);
-static void _publishing_piwigo_piwigo_publisher_on_logout_network_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_piwigo_piwigo_publisher_on_logout_network_complete (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_piwigo_piwigo_publisher_on_logout_network_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
+PublishingPiwigoSessionLogoutTransaction* publishing_piwigo_session_logout_transaction_construct (GType object_type,
+                                                                                                  PublishingPiwigoSession* session);
+static void publishing_piwigo_piwigo_publisher_on_logout_network_error (PublishingPiwigoPiwigoPublisher* self,
+                                                                 PublishingRESTSupportTransaction* bad_txn,
+                                                                 GError* err);
+static void _publishing_piwigo_piwigo_publisher_on_logout_network_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                                    GError* err,
+                                                                                                                    gpointer self);
+static void publishing_piwigo_piwigo_publisher_on_logout_network_complete (PublishingPiwigoPiwigoPublisher* self,
+                                                                    PublishingRESTSupportTransaction* txn);
+static void _publishing_piwigo_piwigo_publisher_on_logout_network_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                                   gpointer self);
 void publishing_piwigo_session_deauthenticate (PublishingPiwigoSession* self);
-static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiwigoPiwigoPublisher* self, PublishingPiwigoCategory* category);
-static void publishing_piwigo_piwigo_publisher_do_upload (PublishingPiwigoPiwigoPublisher* self, gboolean strip_metadata);
+static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiwigoPiwigoPublisher* self,
+                                                            PublishingPiwigoCategory* category);
+static void publishing_piwigo_piwigo_publisher_do_upload (PublishingPiwigoPiwigoPublisher* self,
+                                                   gboolean strip_metadata);
 GType publishing_piwigo_categories_add_transaction_get_type (void) G_GNUC_CONST;
-PublishingPiwigoCategoriesAddTransaction* publishing_piwigo_categories_add_transaction_new (PublishingPiwigoSession* session, const gchar* category, gint parent_id, const gchar* comment);
-PublishingPiwigoCategoriesAddTransaction* publishing_piwigo_categories_add_transaction_construct (GType object_type, PublishingPiwigoSession* session, const gchar* category, gint parent_id, const gchar* comment);
-static void publishing_piwigo_piwigo_publisher_on_category_add_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err);
-static void _publishing_piwigo_piwigo_publisher_on_category_add_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_piwigo_piwigo_publisher_on_category_add_complete (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_piwigo_piwigo_publisher_on_category_add_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
+PublishingPiwigoCategoriesAddTransaction* publishing_piwigo_categories_add_transaction_new (PublishingPiwigoSession* session,
+                                                                                            const gchar* category,
+                                                                                            gint parent_id,
+                                                                                            const gchar* comment);
+PublishingPiwigoCategoriesAddTransaction* publishing_piwigo_categories_add_transaction_construct (GType object_type,
+                                                                                                  PublishingPiwigoSession* session,
+                                                                                                  const gchar* category,
+                                                                                                  gint parent_id,
+                                                                                                  const gchar* comment);
+static void publishing_piwigo_piwigo_publisher_on_category_add_error (PublishingPiwigoPiwigoPublisher* self,
+                                                               PublishingRESTSupportTransaction* bad_txn,
+                                                               GError* err);
+static void _publishing_piwigo_piwigo_publisher_on_category_add_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                                  GError* err,
+                                                                                                                  gpointer self);
+static void publishing_piwigo_piwigo_publisher_on_category_add_complete (PublishingPiwigoPiwigoPublisher* self,
+                                                                  PublishingRESTSupportTransaction* txn);
+static void _publishing_piwigo_piwigo_publisher_on_category_add_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                                 gpointer self);
 GType publishing_piwigo_uploader_get_type (void) G_GNUC_CONST;
-PublishingPiwigoUploader* publishing_piwigo_uploader_new (PublishingPiwigoSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingPiwigoPublishingParameters* parameters);
-PublishingPiwigoUploader* publishing_piwigo_uploader_construct (GType object_type, PublishingPiwigoSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingPiwigoPublishingParameters* parameters);
-static void publishing_piwigo_piwigo_publisher_on_upload_complete (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published);
-static void _publishing_piwigo_piwigo_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self);
-static void publishing_piwigo_piwigo_publisher_on_upload_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err);
-static void _publishing_piwigo_piwigo_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self);
-static void publishing_piwigo_piwigo_publisher_on_upload_status_updated (PublishingPiwigoPiwigoPublisher* self, gint file_number, gdouble completed_fraction);
-static void _publishing_piwigo_piwigo_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self);
+PublishingPiwigoUploader* publishing_piwigo_uploader_new (PublishingPiwigoSession* session,
+                                                          SpitPublishingPublishable** publishables,
+                                                          int publishables_length1,
+                                                          PublishingPiwigoPublishingParameters* parameters);
+PublishingPiwigoUploader* publishing_piwigo_uploader_construct (GType object_type,
+                                                                PublishingPiwigoSession* session,
+                                                                SpitPublishingPublishable** publishables,
+                                                                int publishables_length1,
+                                                                PublishingPiwigoPublishingParameters* parameters);
+static void publishing_piwigo_piwigo_publisher_on_upload_complete (PublishingPiwigoPiwigoPublisher* self,
+                                                            PublishingRESTSupportBatchUploader* uploader,
+                                                            gint num_published);
+static void _publishing_piwigo_piwigo_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender,
+                                                                                                                    gint num_photos_published,
+                                                                                                                    gpointer self);
+static void publishing_piwigo_piwigo_publisher_on_upload_error (PublishingPiwigoPiwigoPublisher* self,
+                                                         PublishingRESTSupportBatchUploader* uploader,
+                                                         GError* err);
+static void _publishing_piwigo_piwigo_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender,
+                                                                                                              GError* err,
+                                                                                                              gpointer self);
+static void publishing_piwigo_piwigo_publisher_on_upload_status_updated (PublishingPiwigoPiwigoPublisher* self,
+                                                                  gint file_number,
+                                                                  gdouble completed_fraction);
+static void _publishing_piwigo_piwigo_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number,
+                                                                                                     gdouble fraction_complete,
+                                                                                                     gpointer self);
 static void publishing_piwigo_piwigo_publisher_do_show_success_pane (PublishingPiwigoPiwigoPublisher* self);
-static void publishing_piwigo_piwigo_publisher_do_show_error_message (PublishingPiwigoPiwigoPublisher* self, const gchar* message);
+static void publishing_piwigo_piwigo_publisher_do_show_error_message (PublishingPiwigoPiwigoPublisher* self,
+                                                               const gchar* message);
 static SoupCookie* _vala_SoupCookie_copy (SoupCookie* self);
 static void _vala_SoupCookie_free (SoupCookie* self);
 static void __vala_SoupCookie_free0_ (gpointer var);
-static void _g_slist_free___vala_SoupCookie_free0_ (GSList* self);
+static inline void _g_slist_free___vala_SoupCookie_free0_ (GSList* self);
 static void publishing_piwigo_piwigo_publisher_finalize (GObject * obj);
 #define PUBLISHING_PIWIGO_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PIWIGO_TYPE_UPLOADER, PublishingPiwigoUploaderPrivate))
-enum  {
-	PUBLISHING_PIWIGO_UPLOADER_DUMMY_PROPERTY
-};
-static PublishingRESTSupportTransaction* publishing_piwigo_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable);
-PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_new (PublishingPiwigoSession* session, PublishingPiwigoPublishingParameters* parameters, SpitPublishingPublishable* publishable);
-PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_construct (GType object_type, PublishingPiwigoSession* session, PublishingPiwigoPublishingParameters* parameters, SpitPublishingPublishable* publishable);
+static PublishingRESTSupportTransaction* publishing_piwigo_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base,
+                                                                                      SpitPublishingPublishable* publishable);
+PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_new (PublishingPiwigoSession* session,
+                                                                                    PublishingPiwigoPublishingParameters* parameters,
+                                                                                    SpitPublishingPublishable* publishable);
+PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_construct (GType object_type,
+                                                                                          PublishingPiwigoSession* session,
+                                                                                          PublishingPiwigoPublishingParameters* parameters,
+                                                                                          SpitPublishingPublishable* publishable);
 GType publishing_piwigo_images_add_transaction_get_type (void) G_GNUC_CONST;
 static void publishing_piwigo_uploader_finalize (PublishingRESTSupportBatchUploader * obj);
 #define PUBLISHING_PIWIGO_SSL_ERROR_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPanePrivate))
-enum  {
-	PUBLISHING_PIWIGO_SSL_ERROR_PANE_DUMMY_PROPERTY,
-	PUBLISHING_PIWIGO_SSL_ERROR_PANE_HOST_PROPERTY,
-	PUBLISHING_PIWIGO_SSL_ERROR_PANE_CERT_PROPERTY,
-	PUBLISHING_PIWIGO_SSL_ERROR_PANE_ERROR_TEXT_PROPERTY
-};
 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 __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 ___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);
+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);
 static void publishing_piwigo_ssl_error_pane_finalize (GObject * obj);
-static void _vala_publishing_piwigo_ssl_error_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
-static void _vala_publishing_piwigo_ssl_error_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
+static void _vala_publishing_piwigo_ssl_error_pane_get_property (GObject * object,
+                                                          guint property_id,
+                                                          GValue * value,
+                                                          GParamSpec * pspec);
+static void _vala_publishing_piwigo_ssl_error_pane_set_property (GObject * object,
+                                                          guint property_id,
+                                                          const GValue * value,
+                                                          GParamSpec * pspec);
 #define PUBLISHING_PIWIGO_AUTHENTICATION_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPanePrivate))
-enum  {
-	PUBLISHING_PIWIGO_AUTHENTICATION_PANE_DUMMY_PROPERTY,
-	PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_PROPERTY,
-	PUBLISHING_PIWIGO_AUTHENTICATION_PANE_PUBLISHER_PROPERTY
-};
 static void publishing_piwigo_authentication_pane_real_constructed (GObject* base);
 PublishingPiwigoAuthenticationPaneMode publishing_piwigo_authentication_pane_get_mode (PublishingPiwigoAuthenticationPane* self);
 PublishingPiwigoPiwigoPublisher* publishing_piwigo_authentication_pane_get_publisher (PublishingPiwigoAuthenticationPane* self);
 static void publishing_piwigo_authentication_pane_on_user_changed (PublishingPiwigoAuthenticationPane* self);
-static void _publishing_piwigo_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
+static void _publishing_piwigo_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender,
+                                                                                  gpointer self);
 static void publishing_piwigo_authentication_pane_on_url_changed (PublishingPiwigoAuthenticationPane* self);
-static void _publishing_piwigo_authentication_pane_on_url_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
+static void _publishing_piwigo_authentication_pane_on_url_changed_gtk_editable_changed (GtkEditable* _sender,
+                                                                                 gpointer self);
 static void publishing_piwigo_authentication_pane_on_password_changed (PublishingPiwigoAuthenticationPane* self);
-static void _publishing_piwigo_authentication_pane_on_password_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
+static void _publishing_piwigo_authentication_pane_on_password_changed_gtk_editable_changed (GtkEditable* _sender,
+                                                                                      gpointer self);
 static void publishing_piwigo_authentication_pane_on_login_button_clicked (PublishingPiwigoAuthenticationPane* self);
-static void _publishing_piwigo_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_piwigo_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                        gpointer self);
 static void publishing_piwigo_authentication_pane_update_login_button_sensitivity (PublishingPiwigoAuthenticationPane* self);
 static void publishing_piwigo_authentication_pane_real_on_pane_installed (ShotwellPluginsCommonBuilderPane* base);
-static void publishing_piwigo_authentication_pane_set_mode (PublishingPiwigoAuthenticationPane* self, PublishingPiwigoAuthenticationPaneMode value);
-static void publishing_piwigo_authentication_pane_set_publisher (PublishingPiwigoAuthenticationPane* self, PublishingPiwigoPiwigoPublisher* value);
-static void g_cclosure_user_marshal_VOID__STRING_STRING_STRING_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
+static void publishing_piwigo_authentication_pane_set_mode (PublishingPiwigoAuthenticationPane* self,
+                                                     PublishingPiwigoAuthenticationPaneMode value);
+static void publishing_piwigo_authentication_pane_set_publisher (PublishingPiwigoAuthenticationPane* self,
+                                                          PublishingPiwigoPiwigoPublisher* value);
+static void g_cclosure_user_marshal_VOID__STRING_STRING_STRING_BOOLEAN (GClosure * closure,
+                                                                 GValue * return_value,
+                                                                 guint n_param_values,
+                                                                 const GValue * param_values,
+                                                                 gpointer invocation_hint,
+                                                                 gpointer marshal_data);
 static void publishing_piwigo_authentication_pane_finalize (GObject * obj);
-static void _vala_publishing_piwigo_authentication_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
-static void _vala_publishing_piwigo_authentication_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
+static void _vala_publishing_piwigo_authentication_pane_get_property (GObject * object,
+                                                               guint property_id,
+                                                               GValue * value,
+                                                               GParamSpec * pspec);
+static void _vala_publishing_piwigo_authentication_pane_set_property (GObject * object,
+                                                               guint property_id,
+                                                               const GValue * value,
+                                                               GParamSpec * pspec);
 #define PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPiwigoPublishingOptionsPanePrivate))
-enum  {
-	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DUMMY_PROPERTY,
-	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_CATEGORY_PROPERTY,
-	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PERMISSION_LEVEL_PROPERTY,
-	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PHOTO_SIZE_PROPERTY,
-	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_TITLE_AS_COMMENT_PROPERTY,
-	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_NO_UPLOAD_TAGS_PROPERTY,
-	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_STRIP_METADATA_ENABLED_PROPERTY,
-	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_EXISTING_CATEGORIES_PROPERTY,
-	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DEFAULT_COMMENT_PROPERTY
-};
-static PublishingPiwigoCategory** _vala_array_dup11 (PublishingPiwigoCategory** self, int length);
-static gboolean _publishing_piwigo_category_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self);
+static PublishingPiwigoCategory** _vala_array_dup13 (PublishingPiwigoCategory** self,
+                                              int length);
+static gboolean _publishing_piwigo_category_equal_gee_equal_data_func (gconstpointer a,
+                                                                gconstpointer b,
+                                                                gpointer self);
 static gchar* publishing_piwigo_publishing_options_pane_get_common_comment_if_possible (PublishingPiwigoPiwigoPublisher* publisher);
 static void publishing_piwigo_publishing_options_pane_real_constructed (GObject* base);
 static gboolean publishing_piwigo_publishing_options_pane_get_strip_metadata_enabled (PublishingPiwigoPublishingOptionsPane* self);
 static gboolean publishing_piwigo_publishing_options_pane_get_last_title_as_comment (PublishingPiwigoPublishingOptionsPane* self);
 static gboolean publishing_piwigo_publishing_options_pane_get_last_no_upload_tags (PublishingPiwigoPublishingOptionsPane* self);
 static void publishing_piwigo_publishing_options_pane_on_logout_button_clicked (PublishingPiwigoPublishingOptionsPane* self);
-static void _publishing_piwigo_publishing_options_pane_on_logout_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_piwigo_publishing_options_pane_on_logout_button_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                             gpointer self);
 static void publishing_piwigo_publishing_options_pane_on_publish_button_clicked (PublishingPiwigoPublishingOptionsPane* self);
-static void _publishing_piwigo_publishing_options_pane_on_publish_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_piwigo_publishing_options_pane_on_publish_button_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                              gpointer self);
 static void publishing_piwigo_publishing_options_pane_on_use_existing_radio_clicked (PublishingPiwigoPublishingOptionsPane* self);
-static void _publishing_piwigo_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_piwigo_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                                  gpointer self);
 static void publishing_piwigo_publishing_options_pane_on_create_new_radio_clicked (PublishingPiwigoPublishingOptionsPane* self);
-static void _publishing_piwigo_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_piwigo_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                                gpointer self);
 static void publishing_piwigo_publishing_options_pane_on_new_category_entry_changed (PublishingPiwigoPublishingOptionsPane* self);
-static void _publishing_piwigo_publishing_options_pane_on_new_category_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
+static void _publishing_piwigo_publishing_options_pane_on_new_category_entry_changed_gtk_editable_changed (GtkEditable* _sender,
+                                                                                                    gpointer self);
 static void publishing_piwigo_publishing_options_pane_on_existing_combo_changed (PublishingPiwigoPublishingOptionsPane* self);
-static void _publishing_piwigo_publishing_options_pane_on_existing_combo_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
-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 void _publishing_piwigo_publishing_options_pane_on_existing_combo_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+                                                                                                 gpointer self);
+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_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 (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 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);
+static void _vala_array_add41 (PublishingPiwigoPermissionLevel** * array,
+                        int* length,
+                        int* size,
+                        PublishingPiwigoPermissionLevel* value);
+static void _vala_array_add42 (PublishingPiwigoPermissionLevel** * array,
+                        int* length,
+                        int* size,
+                        PublishingPiwigoPermissionLevel* value);
+static void _vala_array_add43 (PublishingPiwigoPermissionLevel** * array,
+                        int* length,
+                        int* size,
+                        PublishingPiwigoPermissionLevel* 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 void _vala_array_add46 (PublishingPiwigoSizeEntry** * array,
+                        int* length,
+                        int* size,
+                        PublishingPiwigoSizeEntry* value);
+static void _vala_array_add47 (PublishingPiwigoSizeEntry** * array,
+                        int* length,
+                        int* size,
+                        PublishingPiwigoSizeEntry* value);
+static void _vala_array_add48 (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);
+static gboolean publishing_piwigo_publishing_options_pane_category_already_exists (PublishingPiwigoPublishingOptionsPane* self,
+                                                                            const gchar* category_name);
 static void publishing_piwigo_publishing_options_pane_real_on_pane_installed (ShotwellPluginsCommonBuilderPane* base);
 static void publishing_piwigo_publishing_options_pane_create_categories_combo (PublishingPiwigoPublishingOptionsPane* self);
 static void publishing_piwigo_publishing_options_pane_create_within_categories_combo (PublishingPiwigoPublishingOptionsPane* self);
 static void publishing_piwigo_publishing_options_pane_create_permissions_combo (PublishingPiwigoPublishingOptionsPane* self);
 static void publishing_piwigo_publishing_options_pane_create_size_combo (PublishingPiwigoPublishingOptionsPane* self);
-static gint publishing_piwigo_publishing_options_pane_find_category_index (PublishingPiwigoPublishingOptionsPane* self, gint category_id);
+static gint publishing_piwigo_publishing_options_pane_find_category_index (PublishingPiwigoPublishingOptionsPane* self,
+                                                                    gint category_id);
 static gint publishing_piwigo_publishing_options_pane_get_last_category (PublishingPiwigoPublishingOptionsPane* self);
-static gint publishing_piwigo_publishing_options_pane_find_permission_level_index (PublishingPiwigoPublishingOptionsPane* self, gint permission_level_id);
+static gint publishing_piwigo_publishing_options_pane_find_permission_level_index (PublishingPiwigoPublishingOptionsPane* self,
+                                                                            gint permission_level_id);
 static gint publishing_piwigo_publishing_options_pane_get_last_permission_level (PublishingPiwigoPublishingOptionsPane* self);
-static gint publishing_piwigo_publishing_options_pane_find_size_index (PublishingPiwigoPublishingOptionsPane* self, gint size_id);
+static gint publishing_piwigo_publishing_options_pane_find_size_index (PublishingPiwigoPublishingOptionsPane* self,
+                                                                gint size_id);
 static gint publishing_piwigo_publishing_options_pane_get_last_photo_size (PublishingPiwigoPublishingOptionsPane* self);
-static void publishing_piwigo_publishing_options_pane_set_last_category (PublishingPiwigoPublishingOptionsPane* self, gint value);
-static void publishing_piwigo_publishing_options_pane_set_last_permission_level (PublishingPiwigoPublishingOptionsPane* self, gint value);
-static void publishing_piwigo_publishing_options_pane_set_last_photo_size (PublishingPiwigoPublishingOptionsPane* self, gint value);
-static void publishing_piwigo_publishing_options_pane_set_last_title_as_comment (PublishingPiwigoPublishingOptionsPane* self, gboolean value);
-static void publishing_piwigo_publishing_options_pane_set_last_no_upload_tags (PublishingPiwigoPublishingOptionsPane* self, gboolean value);
-static void publishing_piwigo_publishing_options_pane_set_strip_metadata_enabled (PublishingPiwigoPublishingOptionsPane* self, gboolean value);
-static void publishing_piwigo_publishing_options_pane_set_existing_categories (PublishingPiwigoPublishingOptionsPane* self, GeeList* value);
-static void publishing_piwigo_publishing_options_pane_set_default_comment (PublishingPiwigoPublishingOptionsPane* self, const gchar* value);
-static void g_cclosure_user_marshal_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
+static void publishing_piwigo_publishing_options_pane_set_last_category (PublishingPiwigoPublishingOptionsPane* self,
+                                                                  gint value);
+static void publishing_piwigo_publishing_options_pane_set_last_permission_level (PublishingPiwigoPublishingOptionsPane* self,
+                                                                          gint value);
+static void publishing_piwigo_publishing_options_pane_set_last_photo_size (PublishingPiwigoPublishingOptionsPane* self,
+                                                                    gint value);
+static void publishing_piwigo_publishing_options_pane_set_last_title_as_comment (PublishingPiwigoPublishingOptionsPane* self,
+                                                                          gboolean value);
+static void publishing_piwigo_publishing_options_pane_set_last_no_upload_tags (PublishingPiwigoPublishingOptionsPane* self,
+                                                                        gboolean value);
+static void publishing_piwigo_publishing_options_pane_set_strip_metadata_enabled (PublishingPiwigoPublishingOptionsPane* self,
+                                                                           gboolean value);
+static void publishing_piwigo_publishing_options_pane_set_existing_categories (PublishingPiwigoPublishingOptionsPane* self,
+                                                                        GeeList* value);
+static void publishing_piwigo_publishing_options_pane_set_default_comment (PublishingPiwigoPublishingOptionsPane* self,
+                                                                    const gchar* value);
+static void g_cclosure_user_marshal_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_BOOLEAN (GClosure * closure,
+                                                                                    GValue * return_value,
+                                                                                    guint n_param_values,
+                                                                                    const GValue * param_values,
+                                                                                    gpointer invocation_hint,
+                                                                                    gpointer marshal_data);
 static void publishing_piwigo_publishing_options_pane_finalize (GObject * obj);
-static void _vala_publishing_piwigo_publishing_options_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
-static void _vala_publishing_piwigo_publishing_options_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
+static void _vala_publishing_piwigo_publishing_options_pane_get_property (GObject * object,
+                                                                   guint property_id,
+                                                                   GValue * value,
+                                                                   GParamSpec * pspec);
+static void _vala_publishing_piwigo_publishing_options_pane_set_property (GObject * object,
+                                                                   guint property_id,
+                                                                   const GValue * value,
+                                                                   GParamSpec * pspec);
 #define PUBLISHING_PIWIGO_SESSION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PIWIGO_TYPE_SESSION, PublishingPiwigoSessionPrivate))
-enum  {
-	PUBLISHING_PIWIGO_SESSION_DUMMY_PROPERTY
-};
 static gboolean publishing_piwigo_session_real_is_authenticated (PublishingRESTSupportSession* base);
 static void publishing_piwigo_session_finalize (PublishingRESTSupportSession * obj);
-enum  {
-	PUBLISHING_PIWIGO_TRANSACTION_DUMMY_PROPERTY
-};
 PublishingPiwigoTransaction* publishing_piwigo_transaction_new (PublishingPiwigoSession* session);
-PublishingPiwigoTransaction* publishing_piwigo_transaction_construct (GType object_type, PublishingPiwigoSession* session);
+PublishingPiwigoTransaction* publishing_piwigo_transaction_construct (GType object_type,
+                                                                      PublishingPiwigoSession* session);
 PublishingPiwigoTransaction* publishing_piwigo_transaction_new_authenticated (PublishingPiwigoSession* session);
-PublishingPiwigoTransaction* publishing_piwigo_transaction_construct_authenticated (GType object_type, PublishingPiwigoSession* session);
-enum  {
-	PUBLISHING_PIWIGO_SESSION_LOGIN_TRANSACTION_DUMMY_PROPERTY
-};
-PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_new_from_other (PublishingPiwigoSession* session, PublishingPiwigoTransaction* other);
-PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_construct_from_other (GType object_type, PublishingPiwigoSession* session, PublishingPiwigoTransaction* other);
-enum  {
-	PUBLISHING_PIWIGO_SESSION_GET_STATUS_TRANSACTION_DUMMY_PROPERTY
-};
-enum  {
-	PUBLISHING_PIWIGO_CATEGORIES_GET_LIST_TRANSACTION_DUMMY_PROPERTY
-};
-enum  {
-	PUBLISHING_PIWIGO_SESSION_LOGOUT_TRANSACTION_DUMMY_PROPERTY
-};
-enum  {
-	PUBLISHING_PIWIGO_CATEGORIES_ADD_TRANSACTION_DUMMY_PROPERTY
-};
+PublishingPiwigoTransaction* publishing_piwigo_transaction_construct_authenticated (GType object_type,
+                                                                                    PublishingPiwigoSession* session);
+PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_new_from_other (PublishingPiwigoSession* session,
+                                                                                                     PublishingPiwigoTransaction* other);
+PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_construct_from_other (GType object_type,
+                                                                                                           PublishingPiwigoSession* session,
+                                                                                                           PublishingPiwigoTransaction* other);
 #define PUBLISHING_PIWIGO_IMAGES_ADD_TRANSACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PIWIGO_TYPE_IMAGES_ADD_TRANSACTION, PublishingPiwigoImagesAddTransactionPrivate))
-enum  {
-	PUBLISHING_PIWIGO_IMAGES_ADD_TRANSACTION_DUMMY_PROPERTY
-};
 static void _g_free0_ (gpointer var);
 static void publishing_piwigo_images_add_transaction_finalize (PublishingRESTSupportTransaction * obj);
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
+static void _vala_array_destroy (gpointer array,
+                          gint array_length,
+                          GDestroyNotify destroy_func);
+static void _vala_array_free (gpointer array,
+                       gint array_length,
+                       GDestroyNotify destroy_func);
 static gint _vala_array_length (gpointer array);
 
 
-PiwigoService* piwigo_service_construct (GType object_type, GFile* resource_directory) {
+PiwigoService*
+piwigo_service_construct (GType object_type,
+                          GFile* resource_directory)
+{
 	PiwigoService * self = NULL;
 	GdkPixbuf** _tmp0_;
 	gint _tmp0__length1;
@@ -975,7 +1255,7 @@ PiwigoService* piwigo_service_construct (GType object_type, GFile* resource_dire
 	_tmp0__length1 = piwigo_service_icon_pixbuf_set_length1;
 #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 979 "PiwigoPublishing.c"
+#line 1259 "PiwigoPublishing.c"
 		gint _tmp1_;
 		GdkPixbuf** _tmp2_;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -988,44 +1268,43 @@ PiwigoService* piwigo_service_construct (GType object_type, GFile* resource_dire
 		piwigo_service_icon_pixbuf_set_length1 = _tmp1_;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_piwigo_service_icon_pixbuf_set_size_ = piwigo_service_icon_pixbuf_set_length1;
-#line 992 "PiwigoPublishing.c"
+#line 1272 "PiwigoPublishing.c"
 	}
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 996 "PiwigoPublishing.c"
+#line 1276 "PiwigoPublishing.c"
 }
 
 
-PiwigoService* piwigo_service_new (GFile* resource_directory) {
+PiwigoService*
+piwigo_service_new (GFile* resource_directory)
+{
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return piwigo_service_construct (TYPE_PIWIGO_SERVICE, resource_directory);
-#line 1003 "PiwigoPublishing.c"
+#line 1285 "PiwigoPublishing.c"
 }
 
 
-static gint piwigo_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) {
+static gint
+piwigo_service_real_get_pluggable_interface (SpitPluggable* base,
+                                             gint min_host_interface,
+                                             gint max_host_interface)
+{
 	PiwigoService * self;
 	gint result = 0;
-	gint _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
 #line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PIWIGO_SERVICE, PiwigoService);
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = min_host_interface;
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = max_host_interface;
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = spit_negotiate_interfaces (_tmp0_, _tmp1_, SPIT_PUBLISHING_CURRENT_INTERFACE);
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	result = _tmp2_;
+	result = spit_negotiate_interfaces (min_host_interface, max_host_interface, SPIT_PUBLISHING_CURRENT_INTERFACE);
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 1025 "PiwigoPublishing.c"
+#line 1302 "PiwigoPublishing.c"
 }
 
 
-static const gchar* piwigo_service_real_get_id (SpitPluggable* base) {
+static const gchar*
+piwigo_service_real_get_id (SpitPluggable* base)
+{
 	PiwigoService * self;
 	const gchar* result = NULL;
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -1034,11 +1313,13 @@ static const gchar* piwigo_service_real_get_id (SpitPluggable* base) {
 	result = "org.yorba.shotwell.publishing.piwigo";
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 1038 "PiwigoPublishing.c"
+#line 1317 "PiwigoPublishing.c"
 }
 
 
-static const gchar* piwigo_service_real_get_pluggable_name (SpitPluggable* base) {
+static const gchar*
+piwigo_service_real_get_pluggable_name (SpitPluggable* base)
+{
 	PiwigoService * self;
 	const gchar* result = NULL;
 #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -1047,39 +1328,47 @@ static const gchar* piwigo_service_real_get_pluggable_name (SpitPluggable* base)
 	result = "Piwigo";
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 1051 "PiwigoPublishing.c"
+#line 1332 "PiwigoPublishing.c"
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1058 "PiwigoPublishing.c"
+#line 1341 "PiwigoPublishing.c"
 }
 
 
-static GdkPixbuf** _vala_array_dup10 (GdkPixbuf** self, int length) {
+static GdkPixbuf**
+_vala_array_dup12 (GdkPixbuf** self,
+                   int length)
+{
 	GdkPixbuf** result;
 	int i;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = g_new0 (GdkPixbuf*, length + 1);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 1069 "PiwigoPublishing.c"
+#line 1355 "PiwigoPublishing.c"
 		GdkPixbuf* _tmp0_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		result[i] = _tmp0_;
-#line 1075 "PiwigoPublishing.c"
+#line 1361 "PiwigoPublishing.c"
 	}
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 1079 "PiwigoPublishing.c"
+#line 1365 "PiwigoPublishing.c"
 }
 
 
-static void piwigo_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) {
+static void
+piwigo_service_real_get_info (SpitPluggable* base,
+                              SpitPluggableInfo* info)
+{
 	PiwigoService * self;
 	gchar* _tmp0_;
 	gchar* _tmp1_;
@@ -1145,7 +1434,7 @@ static void piwigo_service_real_get_info (SpitPluggable* base, SpitPluggableInfo
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7__length1 = piwigo_service_icon_pixbuf_set_length1;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup10 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_);
+	_tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup12 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp8__length1 = _tmp7__length1;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -1154,40 +1443,45 @@ static void piwigo_service_real_get_info (SpitPluggable* base, SpitPluggableInfo
 	(*info).icons = _tmp8_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*info).icons_length1 = _tmp8__length1;
-#line 1158 "PiwigoPublishing.c"
+#line 1447 "PiwigoPublishing.c"
 }
 
 
-static void piwigo_service_real_activation (SpitPluggable* base, gboolean enabled) {
+static void
+piwigo_service_real_activation (SpitPluggable* base,
+                                gboolean enabled)
+{
 	PiwigoService * self;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PIWIGO_SERVICE, PiwigoService);
-#line 1166 "PiwigoPublishing.c"
+#line 1458 "PiwigoPublishing.c"
 }
 
 
-static SpitPublishingPublisher* piwigo_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) {
+static SpitPublishingPublisher*
+piwigo_service_real_create_publisher (SpitPublishingService* base,
+                                      SpitPublishingPluginHost* host)
+{
 	PiwigoService * self;
 	SpitPublishingPublisher* result = NULL;
-	SpitPublishingPluginHost* _tmp0_;
-	PublishingPiwigoPiwigoPublisher* _tmp1_;
+	PublishingPiwigoPiwigoPublisher* _tmp0_;
 #line 46 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PIWIGO_SERVICE, PiwigoService);
 #line 46 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = host;
+	_tmp0_ = publishing_piwigo_piwigo_publisher_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService), host);
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = publishing_piwigo_piwigo_publisher_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService), _tmp0_);
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
+	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 1187 "PiwigoPublishing.c"
+#line 1479 "PiwigoPublishing.c"
 }
 
 
-static SpitPublishingPublisherMediaType piwigo_service_real_get_supported_media (SpitPublishingService* base) {
+static SpitPublishingPublisherMediaType
+piwigo_service_real_get_supported_media (SpitPublishingService* base)
+{
 	PiwigoService * self;
 	SpitPublishingPublisherMediaType result = 0;
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -1196,20 +1490,24 @@ static SpitPublishingPublisherMediaType piwigo_service_real_get_supported_media
 	result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO;
 #line 51 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 1200 "PiwigoPublishing.c"
+#line 1494 "PiwigoPublishing.c"
 }
 
 
-static void piwigo_service_class_init (PiwigoServiceClass * klass) {
+static void
+piwigo_service_class_init (PiwigoServiceClass * klass)
+{
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	piwigo_service_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = piwigo_service_finalize;
-#line 1209 "PiwigoPublishing.c"
+#line 1505 "PiwigoPublishing.c"
 }
 
 
-static void piwigo_service_spit_pluggable_interface_init (SpitPluggableIface * iface) {
+static void
+piwigo_service_spit_pluggable_interface_init (SpitPluggableIface * iface)
+{
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	piwigo_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -1222,36 +1520,44 @@ static void piwigo_service_spit_pluggable_interface_init (SpitPluggableIface * i
 	iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) piwigo_service_real_get_info;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	iface->activation = (void (*) (SpitPluggable *, gboolean)) piwigo_service_real_activation;
-#line 1226 "PiwigoPublishing.c"
+#line 1524 "PiwigoPublishing.c"
 }
 
 
-static void piwigo_service_spit_publishing_service_interface_init (SpitPublishingServiceIface * iface) {
+static void
+piwigo_service_spit_publishing_service_interface_init (SpitPublishingServiceIface * iface)
+{
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	piwigo_service_spit_publishing_service_parent_iface = g_type_interface_peek_parent (iface);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	iface->create_publisher = (SpitPublishingPublisher* (*) (SpitPublishingService *, SpitPublishingPluginHost*)) piwigo_service_real_create_publisher;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) piwigo_service_real_get_supported_media;
-#line 1237 "PiwigoPublishing.c"
+#line 1537 "PiwigoPublishing.c"
 }
 
 
-static void piwigo_service_instance_init (PiwigoService * self) {
+static void
+piwigo_service_instance_init (PiwigoService * self)
+{
 }
 
 
-static void piwigo_service_finalize (GObject * obj) {
+static void
+piwigo_service_finalize (GObject * obj)
+{
 	PiwigoService * self;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PIWIGO_SERVICE, PiwigoService);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (piwigo_service_parent_class)->finalize (obj);
-#line 1251 "PiwigoPublishing.c"
+#line 1555 "PiwigoPublishing.c"
 }
 
 
-GType piwigo_service_get_type (void) {
+GType
+piwigo_service_get_type (void)
+{
 	static volatile gsize piwigo_service_type_id__volatile = 0;
 	if (g_once_init_enter (&piwigo_service_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PiwigoServiceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) piwigo_service_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PiwigoService), 0, (GInstanceInitFunc) piwigo_service_instance_init, NULL };
@@ -1267,15 +1573,17 @@ GType piwigo_service_get_type (void) {
 }
 
 
-PublishingPiwigoCategory* publishing_piwigo_category_construct (GType object_type, gint id, const gchar* name, const gchar* uppercats, const gchar* comment) {
+PublishingPiwigoCategory*
+publishing_piwigo_category_construct (GType object_type,
+                                      gint id,
+                                      const gchar* name,
+                                      const gchar* uppercats,
+                                      const gchar* comment)
+{
 	PublishingPiwigoCategory* self = NULL;
-	gint _tmp0_;
-	const gchar* _tmp1_;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
 	gchar* _tmp2_;
-	const gchar* _tmp3_;
-	gchar* _tmp4_;
-	const gchar* _tmp5_;
-	gchar* _tmp6_;
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -1283,54 +1591,53 @@ PublishingPiwigoCategory* publishing_piwigo_category_construct (GType object_typ
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = (PublishingPiwigoCategory*) g_type_create_instance (object_type);
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = id;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->id = _tmp0_;
+	self->id = id;
 #line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = name;
-#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = g_strdup (_tmp1_);
+	_tmp0_ = g_strdup (name);
 #line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->name);
 #line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->name = _tmp2_;
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp3_ = uppercats;
+	self->name = _tmp0_;
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp4_ = g_strdup (_tmp3_);
+	_tmp1_ = g_strdup (uppercats);
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->uppercats);
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->uppercats = _tmp4_;
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp5_ = comment;
+	self->uppercats = _tmp1_;
 #line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp6_ = g_strdup (_tmp5_);
+	_tmp2_ = g_strdup (comment);
 #line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->comment);
 #line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->comment = _tmp6_;
+	self->comment = _tmp2_;
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 1316 "PiwigoPublishing.c"
+#line 1616 "PiwigoPublishing.c"
 }
 
 
-PublishingPiwigoCategory* publishing_piwigo_category_new (gint id, const gchar* name, const gchar* uppercats, const gchar* comment) {
+PublishingPiwigoCategory*
+publishing_piwigo_category_new (gint id,
+                                const gchar* name,
+                                const gchar* uppercats,
+                                const gchar* comment)
+{
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_category_construct (PUBLISHING_PIWIGO_TYPE_CATEGORY, id, name, uppercats, comment);
-#line 1323 "PiwigoPublishing.c"
+#line 1628 "PiwigoPublishing.c"
 }
 
 
-PublishingPiwigoCategory* publishing_piwigo_category_construct_local (GType object_type, const gchar* name, gint parent_id, const gchar* comment) {
+PublishingPiwigoCategory*
+publishing_piwigo_category_construct_local (GType object_type,
+                                            const gchar* name,
+                                            gint parent_id,
+                                            const gchar* comment)
+{
 	PublishingPiwigoCategory* self = NULL;
-	const gchar* _tmp0_;
+	gchar* _tmp0_;
 	gchar* _tmp1_;
-	gint _tmp2_;
-	gchar* _tmp3_;
-	const gchar* _tmp4_;
-	gchar* _tmp5_;
+	gchar* _tmp2_;
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -1338,43 +1645,43 @@ PublishingPiwigoCategory* publishing_piwigo_category_construct_local (GType obje
 #line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->id = PUBLISHING_PIWIGO_CATEGORY_NO_ID;
 #line 78 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = name;
-#line 78 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (name);
 #line 78 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->name);
 #line 78 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->name = _tmp1_;
+	self->name = _tmp0_;
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = parent_id;
-#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp3_ = g_strdup_printf ("%i", _tmp2_);
+	_tmp1_ = g_strdup_printf ("%i", parent_id);
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->uppercats);
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->uppercats = _tmp3_;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp4_ = comment;
+	self->uppercats = _tmp1_;
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp5_ = g_strdup (_tmp4_);
+	_tmp2_ = g_strdup (comment);
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->comment);
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->comment = _tmp5_;
+	self->comment = _tmp2_;
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 1367 "PiwigoPublishing.c"
+#line 1668 "PiwigoPublishing.c"
 }
 
 
-PublishingPiwigoCategory* publishing_piwigo_category_new_local (const gchar* name, gint parent_id, const gchar* comment) {
+PublishingPiwigoCategory*
+publishing_piwigo_category_new_local (const gchar* name,
+                                      gint parent_id,
+                                      const gchar* comment)
+{
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_category_construct_local (PUBLISHING_PIWIGO_TYPE_CATEGORY, name, parent_id, comment);
-#line 1374 "PiwigoPublishing.c"
+#line 1679 "PiwigoPublishing.c"
 }
 
 
-gboolean publishing_piwigo_category_is_local (PublishingPiwigoCategory* self) {
+gboolean
+publishing_piwigo_category_is_local (PublishingPiwigoCategory* self)
+{
 	gboolean result = FALSE;
 	gint _tmp0_;
 #line 85 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -1385,134 +1692,156 @@ gboolean publishing_piwigo_category_is_local (PublishingPiwigoCategory* self) {
 	result = _tmp0_ == PUBLISHING_PIWIGO_CATEGORY_NO_ID;
 #line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 1389 "PiwigoPublishing.c"
+#line 1696 "PiwigoPublishing.c"
 }
 
 
-gboolean publishing_piwigo_category_equal (PublishingPiwigoCategory* _self_, PublishingPiwigoCategory* other) {
+gboolean
+publishing_piwigo_category_equal (PublishingPiwigoCategory* _self_,
+                                  PublishingPiwigoCategory* other)
+{
 	gboolean result = FALSE;
-	PublishingPiwigoCategory* _tmp0_;
+	gint _tmp0_;
 	gint _tmp1_;
-	PublishingPiwigoCategory* _tmp2_;
-	gint _tmp3_;
 #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_CATEGORY (_self_), FALSE);
 #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_CATEGORY (other), FALSE);
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = _self_;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = _tmp0_->id;
+	_tmp0_ = _self_->id;
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = other;
+	_tmp1_ = other->id;
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp3_ = _tmp2_->id;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	result = _tmp1_ == _tmp3_;
+	result = _tmp0_ == _tmp1_;
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 1415 "PiwigoPublishing.c"
+#line 1719 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_value_category_init (GValue* value) {
+static void
+publishing_piwigo_value_category_init (GValue* value)
+{
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 1422 "PiwigoPublishing.c"
+#line 1728 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_value_category_free_value (GValue* value) {
+static void
+publishing_piwigo_value_category_free_value (GValue* value)
+{
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (value->data[0].v_pointer) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_category_unref (value->data[0].v_pointer);
-#line 1431 "PiwigoPublishing.c"
+#line 1739 "PiwigoPublishing.c"
 	}
 }
 
 
-static void publishing_piwigo_value_category_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_piwigo_value_category_copy_value (const GValue* src_value,
+                                             GValue* dest_value)
+{
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (src_value->data[0].v_pointer) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_piwigo_category_ref (src_value->data[0].v_pointer);
-#line 1441 "PiwigoPublishing.c"
+#line 1752 "PiwigoPublishing.c"
 	} else {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1445 "PiwigoPublishing.c"
+#line 1756 "PiwigoPublishing.c"
 	}
 }
 
 
-static gpointer publishing_piwigo_value_category_peek_pointer (const GValue* value) {
+static gpointer
+publishing_piwigo_value_category_peek_pointer (const GValue* value)
+{
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1453 "PiwigoPublishing.c"
+#line 1766 "PiwigoPublishing.c"
 }
 
 
-static gchar* publishing_piwigo_value_category_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_piwigo_value_category_collect_value (GValue* value,
+                                                guint n_collect_values,
+                                                GTypeCValue* collect_values,
+                                                guint collect_flags)
+{
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 1460 "PiwigoPublishing.c"
+#line 1778 "PiwigoPublishing.c"
 		PublishingPiwigoCategory * object;
 		object = collect_values[0].v_pointer;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1467 "PiwigoPublishing.c"
+#line 1785 "PiwigoPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1471 "PiwigoPublishing.c"
+#line 1789 "PiwigoPublishing.c"
 		}
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = publishing_piwigo_category_ref (object);
-#line 1475 "PiwigoPublishing.c"
+#line 1793 "PiwigoPublishing.c"
 	} else {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1479 "PiwigoPublishing.c"
+#line 1797 "PiwigoPublishing.c"
 	}
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return NULL;
-#line 1483 "PiwigoPublishing.c"
+#line 1801 "PiwigoPublishing.c"
 }
 
 
-static gchar* publishing_piwigo_value_category_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_piwigo_value_category_lcopy_value (const GValue* value,
+                                              guint n_collect_values,
+                                              GTypeCValue* collect_values,
+                                              guint collect_flags)
+{
 	PublishingPiwigoCategory ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!object_p) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1494 "PiwigoPublishing.c"
+#line 1817 "PiwigoPublishing.c"
 	}
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = NULL;
-#line 1500 "PiwigoPublishing.c"
+#line 1823 "PiwigoPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1504 "PiwigoPublishing.c"
+#line 1827 "PiwigoPublishing.c"
 	} else {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = publishing_piwigo_category_ref (value->data[0].v_pointer);
-#line 1508 "PiwigoPublishing.c"
+#line 1831 "PiwigoPublishing.c"
 	}
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return NULL;
-#line 1512 "PiwigoPublishing.c"
+#line 1835 "PiwigoPublishing.c"
 }
 
 
-GParamSpec* publishing_piwigo_param_spec_category (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_piwigo_param_spec_category (const gchar* name,
+                                       const gchar* nick,
+                                       const gchar* blurb,
+                                       GType object_type,
+                                       GParamFlags flags)
+{
 	PublishingPiwigoParamSpecCategory* spec;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_PIWIGO_TYPE_CATEGORY), NULL);
@@ -1522,20 +1851,25 @@ GParamSpec* publishing_piwigo_param_spec_category (const gchar* name, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 1526 "PiwigoPublishing.c"
+#line 1855 "PiwigoPublishing.c"
 }
 
 
-gpointer publishing_piwigo_value_get_category (const GValue* value) {
+gpointer
+publishing_piwigo_value_get_category (const GValue* value)
+{
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_CATEGORY), NULL);
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1535 "PiwigoPublishing.c"
+#line 1866 "PiwigoPublishing.c"
 }
 
 
-void publishing_piwigo_value_set_category (GValue* value, gpointer v_object) {
+void
+publishing_piwigo_value_set_category (GValue* value,
+                                      gpointer v_object)
+{
 	PublishingPiwigoCategory * old;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_CATEGORY));
@@ -1551,22 +1885,25 @@ void publishing_piwigo_value_set_category (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_category_ref (value->data[0].v_pointer);
-#line 1555 "PiwigoPublishing.c"
+#line 1889 "PiwigoPublishing.c"
 	} else {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1559 "PiwigoPublishing.c"
+#line 1893 "PiwigoPublishing.c"
 	}
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (old) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_category_unref (old);
-#line 1565 "PiwigoPublishing.c"
+#line 1899 "PiwigoPublishing.c"
 	}
 }
 
 
-void publishing_piwigo_value_take_category (GValue* value, gpointer v_object) {
+void
+publishing_piwigo_value_take_category (GValue* value,
+                                       gpointer v_object)
+{
 	PublishingPiwigoCategory * old;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_CATEGORY));
@@ -1580,38 +1917,44 @@ void publishing_piwigo_value_take_category (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1584 "PiwigoPublishing.c"
+#line 1921 "PiwigoPublishing.c"
 	} else {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1588 "PiwigoPublishing.c"
+#line 1925 "PiwigoPublishing.c"
 	}
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (old) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_category_unref (old);
-#line 1594 "PiwigoPublishing.c"
+#line 1931 "PiwigoPublishing.c"
 	}
 }
 
 
-static void publishing_piwigo_category_class_init (PublishingPiwigoCategoryClass * klass) {
+static void
+publishing_piwigo_category_class_init (PublishingPiwigoCategoryClass * klass)
+{
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_category_parent_class = g_type_class_peek_parent (klass);
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	((PublishingPiwigoCategoryClass *) klass)->finalize = publishing_piwigo_category_finalize;
-#line 1604 "PiwigoPublishing.c"
+#line 1943 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_category_instance_init (PublishingPiwigoCategory * self) {
+static void
+publishing_piwigo_category_instance_init (PublishingPiwigoCategory * self)
+{
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->ref_count = 1;
-#line 1611 "PiwigoPublishing.c"
+#line 1952 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_category_finalize (PublishingPiwigoCategory * obj) {
+static void
+publishing_piwigo_category_finalize (PublishingPiwigoCategory * obj)
+{
 	PublishingPiwigoCategory * self;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_CATEGORY, PublishingPiwigoCategory);
@@ -1625,11 +1968,13 @@ static void publishing_piwigo_category_finalize (PublishingPiwigoCategory * obj)
 	_g_free0 (self->display_name);
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->uppercats);
-#line 1629 "PiwigoPublishing.c"
+#line 1972 "PiwigoPublishing.c"
 }
 
 
-GType publishing_piwigo_category_get_type (void) {
+GType
+publishing_piwigo_category_get_type (void)
+{
 	static volatile gsize publishing_piwigo_category_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_piwigo_category_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { publishing_piwigo_value_category_init, publishing_piwigo_value_category_free_value, publishing_piwigo_value_category_copy_value, publishing_piwigo_value_category_peek_pointer, "p", publishing_piwigo_value_category_collect_value, "p", publishing_piwigo_value_category_lcopy_value };
@@ -1643,18 +1988,22 @@ GType publishing_piwigo_category_get_type (void) {
 }
 
 
-gpointer publishing_piwigo_category_ref (gpointer instance) {
+gpointer
+publishing_piwigo_category_ref (gpointer instance)
+{
 	PublishingPiwigoCategory * self;
 	self = instance;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return instance;
-#line 1654 "PiwigoPublishing.c"
+#line 2001 "PiwigoPublishing.c"
 }
 
 
-void publishing_piwigo_category_unref (gpointer instance) {
+void
+publishing_piwigo_category_unref (gpointer instance)
+{
 	PublishingPiwigoCategory * self;
 	self = instance;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -1663,143 +2012,169 @@ void publishing_piwigo_category_unref (gpointer instance) {
 		PUBLISHING_PIWIGO_CATEGORY_GET_CLASS (self)->finalize (self);
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1667 "PiwigoPublishing.c"
+#line 2016 "PiwigoPublishing.c"
 	}
 }
 
 
-PublishingPiwigoPermissionLevel* publishing_piwigo_permission_level_construct (GType object_type, gint id, const gchar* name) {
+PublishingPiwigoPermissionLevel*
+publishing_piwigo_permission_level_construct (GType object_type,
+                                              gint id,
+                                              const gchar* name)
+{
 	PublishingPiwigoPermissionLevel* self = NULL;
-	gint _tmp0_;
-	const gchar* _tmp1_;
-	gchar* _tmp2_;
+	gchar* _tmp0_;
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = (PublishingPiwigoPermissionLevel*) g_type_create_instance (object_type);
 #line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = id;
-#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->id = _tmp0_;
+	self->id = id;
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = name;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = g_strdup (_tmp1_);
+	_tmp0_ = g_strdup (name);
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->name);
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->name = _tmp2_;
+	self->name = _tmp0_;
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 1695 "PiwigoPublishing.c"
+#line 2042 "PiwigoPublishing.c"
 }
 
 
-PublishingPiwigoPermissionLevel* publishing_piwigo_permission_level_new (gint id, const gchar* name) {
+PublishingPiwigoPermissionLevel*
+publishing_piwigo_permission_level_new (gint id,
+                                        const gchar* name)
+{
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_permission_level_construct (PUBLISHING_PIWIGO_TYPE_PERMISSION_LEVEL, id, name);
-#line 1702 "PiwigoPublishing.c"
+#line 2052 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_value_permission_level_init (GValue* value) {
+static void
+publishing_piwigo_value_permission_level_init (GValue* value)
+{
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 1709 "PiwigoPublishing.c"
+#line 2061 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_value_permission_level_free_value (GValue* value) {
+static void
+publishing_piwigo_value_permission_level_free_value (GValue* value)
+{
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (value->data[0].v_pointer) {
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_permission_level_unref (value->data[0].v_pointer);
-#line 1718 "PiwigoPublishing.c"
+#line 2072 "PiwigoPublishing.c"
 	}
 }
 
 
-static void publishing_piwigo_value_permission_level_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_piwigo_value_permission_level_copy_value (const GValue* src_value,
+                                                     GValue* dest_value)
+{
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (src_value->data[0].v_pointer) {
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_piwigo_permission_level_ref (src_value->data[0].v_pointer);
-#line 1728 "PiwigoPublishing.c"
+#line 2085 "PiwigoPublishing.c"
 	} else {
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1732 "PiwigoPublishing.c"
+#line 2089 "PiwigoPublishing.c"
 	}
 }
 
 
-static gpointer publishing_piwigo_value_permission_level_peek_pointer (const GValue* value) {
+static gpointer
+publishing_piwigo_value_permission_level_peek_pointer (const GValue* value)
+{
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1740 "PiwigoPublishing.c"
+#line 2099 "PiwigoPublishing.c"
 }
 
 
-static gchar* publishing_piwigo_value_permission_level_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_piwigo_value_permission_level_collect_value (GValue* value,
+                                                        guint n_collect_values,
+                                                        GTypeCValue* collect_values,
+                                                        guint collect_flags)
+{
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 1747 "PiwigoPublishing.c"
+#line 2111 "PiwigoPublishing.c"
 		PublishingPiwigoPermissionLevel * object;
 		object = collect_values[0].v_pointer;
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1754 "PiwigoPublishing.c"
+#line 2118 "PiwigoPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1758 "PiwigoPublishing.c"
+#line 2122 "PiwigoPublishing.c"
 		}
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = publishing_piwigo_permission_level_ref (object);
-#line 1762 "PiwigoPublishing.c"
+#line 2126 "PiwigoPublishing.c"
 	} else {
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1766 "PiwigoPublishing.c"
+#line 2130 "PiwigoPublishing.c"
 	}
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return NULL;
-#line 1770 "PiwigoPublishing.c"
+#line 2134 "PiwigoPublishing.c"
 }
 
 
-static gchar* publishing_piwigo_value_permission_level_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_piwigo_value_permission_level_lcopy_value (const GValue* value,
+                                                      guint n_collect_values,
+                                                      GTypeCValue* collect_values,
+                                                      guint collect_flags)
+{
 	PublishingPiwigoPermissionLevel ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!object_p) {
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1781 "PiwigoPublishing.c"
+#line 2150 "PiwigoPublishing.c"
 	}
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = NULL;
-#line 1787 "PiwigoPublishing.c"
+#line 2156 "PiwigoPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1791 "PiwigoPublishing.c"
+#line 2160 "PiwigoPublishing.c"
 	} else {
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = publishing_piwigo_permission_level_ref (value->data[0].v_pointer);
-#line 1795 "PiwigoPublishing.c"
+#line 2164 "PiwigoPublishing.c"
 	}
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return NULL;
-#line 1799 "PiwigoPublishing.c"
+#line 2168 "PiwigoPublishing.c"
 }
 
 
-GParamSpec* publishing_piwigo_param_spec_permission_level (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_piwigo_param_spec_permission_level (const gchar* name,
+                                               const gchar* nick,
+                                               const gchar* blurb,
+                                               GType object_type,
+                                               GParamFlags flags)
+{
 	PublishingPiwigoParamSpecPermissionLevel* spec;
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_PIWIGO_TYPE_PERMISSION_LEVEL), NULL);
@@ -1809,20 +2184,25 @@ GParamSpec* publishing_piwigo_param_spec_permission_level (const gchar* name, co
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 1813 "PiwigoPublishing.c"
+#line 2188 "PiwigoPublishing.c"
 }
 
 
-gpointer publishing_piwigo_value_get_permission_level (const GValue* value) {
+gpointer
+publishing_piwigo_value_get_permission_level (const GValue* value)
+{
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_PERMISSION_LEVEL), NULL);
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1822 "PiwigoPublishing.c"
+#line 2199 "PiwigoPublishing.c"
 }
 
 
-void publishing_piwigo_value_set_permission_level (GValue* value, gpointer v_object) {
+void
+publishing_piwigo_value_set_permission_level (GValue* value,
+                                              gpointer v_object)
+{
 	PublishingPiwigoPermissionLevel * old;
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_PERMISSION_LEVEL));
@@ -1838,22 +2218,25 @@ void publishing_piwigo_value_set_permission_level (GValue* value, gpointer v_obj
 		value->data[0].v_pointer = v_object;
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_permission_level_ref (value->data[0].v_pointer);
-#line 1842 "PiwigoPublishing.c"
+#line 2222 "PiwigoPublishing.c"
 	} else {
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1846 "PiwigoPublishing.c"
+#line 2226 "PiwigoPublishing.c"
 	}
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (old) {
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_permission_level_unref (old);
-#line 1852 "PiwigoPublishing.c"
+#line 2232 "PiwigoPublishing.c"
 	}
 }
 
 
-void publishing_piwigo_value_take_permission_level (GValue* value, gpointer v_object) {
+void
+publishing_piwigo_value_take_permission_level (GValue* value,
+                                               gpointer v_object)
+{
 	PublishingPiwigoPermissionLevel * old;
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_PERMISSION_LEVEL));
@@ -1867,38 +2250,44 @@ void publishing_piwigo_value_take_permission_level (GValue* value, gpointer v_ob
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1871 "PiwigoPublishing.c"
+#line 2254 "PiwigoPublishing.c"
 	} else {
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1875 "PiwigoPublishing.c"
+#line 2258 "PiwigoPublishing.c"
 	}
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (old) {
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_permission_level_unref (old);
-#line 1881 "PiwigoPublishing.c"
+#line 2264 "PiwigoPublishing.c"
 	}
 }
 
 
-static void publishing_piwigo_permission_level_class_init (PublishingPiwigoPermissionLevelClass * klass) {
+static void
+publishing_piwigo_permission_level_class_init (PublishingPiwigoPermissionLevelClass * klass)
+{
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_permission_level_parent_class = g_type_class_peek_parent (klass);
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	((PublishingPiwigoPermissionLevelClass *) klass)->finalize = publishing_piwigo_permission_level_finalize;
-#line 1891 "PiwigoPublishing.c"
+#line 2276 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_permission_level_instance_init (PublishingPiwigoPermissionLevel * self) {
+static void
+publishing_piwigo_permission_level_instance_init (PublishingPiwigoPermissionLevel * self)
+{
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->ref_count = 1;
-#line 1898 "PiwigoPublishing.c"
+#line 2285 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_permission_level_finalize (PublishingPiwigoPermissionLevel * obj) {
+static void
+publishing_piwigo_permission_level_finalize (PublishingPiwigoPermissionLevel * obj)
+{
 	PublishingPiwigoPermissionLevel * self;
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_PERMISSION_LEVEL, PublishingPiwigoPermissionLevel);
@@ -1906,11 +2295,13 @@ static void publishing_piwigo_permission_level_finalize (PublishingPiwigoPermiss
 	g_signal_handlers_destroy (self);
 #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->name);
-#line 1910 "PiwigoPublishing.c"
+#line 2299 "PiwigoPublishing.c"
 }
 
 
-GType publishing_piwigo_permission_level_get_type (void) {
+GType
+publishing_piwigo_permission_level_get_type (void)
+{
 	static volatile gsize publishing_piwigo_permission_level_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_piwigo_permission_level_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { publishing_piwigo_value_permission_level_init, publishing_piwigo_value_permission_level_free_value, publishing_piwigo_value_permission_level_copy_value, publishing_piwigo_value_permission_level_peek_pointer, "p", publishing_piwigo_value_permission_level_collect_value, "p", publishing_piwigo_value_permission_level_lcopy_value };
@@ -1924,18 +2315,22 @@ GType publishing_piwigo_permission_level_get_type (void) {
 }
 
 
-gpointer publishing_piwigo_permission_level_ref (gpointer instance) {
+gpointer
+publishing_piwigo_permission_level_ref (gpointer instance)
+{
 	PublishingPiwigoPermissionLevel * self;
 	self = instance;
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return instance;
-#line 1935 "PiwigoPublishing.c"
+#line 2328 "PiwigoPublishing.c"
 }
 
 
-void publishing_piwigo_permission_level_unref (gpointer instance) {
+void
+publishing_piwigo_permission_level_unref (gpointer instance)
+{
 	PublishingPiwigoPermissionLevel * self;
 	self = instance;
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -1944,143 +2339,169 @@ void publishing_piwigo_permission_level_unref (gpointer instance) {
 		PUBLISHING_PIWIGO_PERMISSION_LEVEL_GET_CLASS (self)->finalize (self);
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1948 "PiwigoPublishing.c"
+#line 2343 "PiwigoPublishing.c"
 	}
 }
 
 
-PublishingPiwigoSizeEntry* publishing_piwigo_size_entry_construct (GType object_type, gint id, const gchar* name) {
+PublishingPiwigoSizeEntry*
+publishing_piwigo_size_entry_construct (GType object_type,
+                                        gint id,
+                                        const gchar* name)
+{
 	PublishingPiwigoSizeEntry* self = NULL;
-	gint _tmp0_;
-	const gchar* _tmp1_;
-	gchar* _tmp2_;
+	gchar* _tmp0_;
 #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = (PublishingPiwigoSizeEntry*) g_type_create_instance (object_type);
 #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = id;
-#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->id = _tmp0_;
+	self->id = id;
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = name;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = g_strdup (_tmp1_);
+	_tmp0_ = g_strdup (name);
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->name);
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->name = _tmp2_;
+	self->name = _tmp0_;
 #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 1976 "PiwigoPublishing.c"
+#line 2369 "PiwigoPublishing.c"
 }
 
 
-PublishingPiwigoSizeEntry* publishing_piwigo_size_entry_new (gint id, const gchar* name) {
+PublishingPiwigoSizeEntry*
+publishing_piwigo_size_entry_new (gint id,
+                                  const gchar* name)
+{
 #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_size_entry_construct (PUBLISHING_PIWIGO_TYPE_SIZE_ENTRY, id, name);
-#line 1983 "PiwigoPublishing.c"
+#line 2379 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_value_size_entry_init (GValue* value) {
+static void
+publishing_piwigo_value_size_entry_init (GValue* value)
+{
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 1990 "PiwigoPublishing.c"
+#line 2388 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_value_size_entry_free_value (GValue* value) {
+static void
+publishing_piwigo_value_size_entry_free_value (GValue* value)
+{
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (value->data[0].v_pointer) {
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_size_entry_unref (value->data[0].v_pointer);
-#line 1999 "PiwigoPublishing.c"
+#line 2399 "PiwigoPublishing.c"
 	}
 }
 
 
-static void publishing_piwigo_value_size_entry_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_piwigo_value_size_entry_copy_value (const GValue* src_value,
+                                               GValue* dest_value)
+{
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (src_value->data[0].v_pointer) {
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_piwigo_size_entry_ref (src_value->data[0].v_pointer);
-#line 2009 "PiwigoPublishing.c"
+#line 2412 "PiwigoPublishing.c"
 	} else {
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2013 "PiwigoPublishing.c"
+#line 2416 "PiwigoPublishing.c"
 	}
 }
 
 
-static gpointer publishing_piwigo_value_size_entry_peek_pointer (const GValue* value) {
+static gpointer
+publishing_piwigo_value_size_entry_peek_pointer (const GValue* value)
+{
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return value->data[0].v_pointer;
-#line 2021 "PiwigoPublishing.c"
+#line 2426 "PiwigoPublishing.c"
 }
 
 
-static gchar* publishing_piwigo_value_size_entry_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_piwigo_value_size_entry_collect_value (GValue* value,
+                                                  guint n_collect_values,
+                                                  GTypeCValue* collect_values,
+                                                  guint collect_flags)
+{
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 2028 "PiwigoPublishing.c"
+#line 2438 "PiwigoPublishing.c"
 		PublishingPiwigoSizeEntry * object;
 		object = collect_values[0].v_pointer;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2035 "PiwigoPublishing.c"
+#line 2445 "PiwigoPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2039 "PiwigoPublishing.c"
+#line 2449 "PiwigoPublishing.c"
 		}
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = publishing_piwigo_size_entry_ref (object);
-#line 2043 "PiwigoPublishing.c"
+#line 2453 "PiwigoPublishing.c"
 	} else {
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 2047 "PiwigoPublishing.c"
+#line 2457 "PiwigoPublishing.c"
 	}
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return NULL;
-#line 2051 "PiwigoPublishing.c"
+#line 2461 "PiwigoPublishing.c"
 }
 
 
-static gchar* publishing_piwigo_value_size_entry_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_piwigo_value_size_entry_lcopy_value (const GValue* value,
+                                                guint n_collect_values,
+                                                GTypeCValue* collect_values,
+                                                guint collect_flags)
+{
 	PublishingPiwigoSizeEntry ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!object_p) {
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2062 "PiwigoPublishing.c"
+#line 2477 "PiwigoPublishing.c"
 	}
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = NULL;
-#line 2068 "PiwigoPublishing.c"
+#line 2483 "PiwigoPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2072 "PiwigoPublishing.c"
+#line 2487 "PiwigoPublishing.c"
 	} else {
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = publishing_piwigo_size_entry_ref (value->data[0].v_pointer);
-#line 2076 "PiwigoPublishing.c"
+#line 2491 "PiwigoPublishing.c"
 	}
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return NULL;
-#line 2080 "PiwigoPublishing.c"
+#line 2495 "PiwigoPublishing.c"
 }
 
 
-GParamSpec* publishing_piwigo_param_spec_size_entry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_piwigo_param_spec_size_entry (const gchar* name,
+                                         const gchar* nick,
+                                         const gchar* blurb,
+                                         GType object_type,
+                                         GParamFlags flags)
+{
 	PublishingPiwigoParamSpecSizeEntry* spec;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_PIWIGO_TYPE_SIZE_ENTRY), NULL);
@@ -2090,20 +2511,25 @@ GParamSpec* publishing_piwigo_param_spec_size_entry (const gchar* name, const gc
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 2094 "PiwigoPublishing.c"
+#line 2515 "PiwigoPublishing.c"
 }
 
 
-gpointer publishing_piwigo_value_get_size_entry (const GValue* value) {
+gpointer
+publishing_piwigo_value_get_size_entry (const GValue* value)
+{
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_SIZE_ENTRY), NULL);
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return value->data[0].v_pointer;
-#line 2103 "PiwigoPublishing.c"
+#line 2526 "PiwigoPublishing.c"
 }
 
 
-void publishing_piwigo_value_set_size_entry (GValue* value, gpointer v_object) {
+void
+publishing_piwigo_value_set_size_entry (GValue* value,
+                                        gpointer v_object)
+{
 	PublishingPiwigoSizeEntry * old;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_SIZE_ENTRY));
@@ -2119,22 +2545,25 @@ void publishing_piwigo_value_set_size_entry (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_size_entry_ref (value->data[0].v_pointer);
-#line 2123 "PiwigoPublishing.c"
+#line 2549 "PiwigoPublishing.c"
 	} else {
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 2127 "PiwigoPublishing.c"
+#line 2553 "PiwigoPublishing.c"
 	}
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (old) {
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_size_entry_unref (old);
-#line 2133 "PiwigoPublishing.c"
+#line 2559 "PiwigoPublishing.c"
 	}
 }
 
 
-void publishing_piwigo_value_take_size_entry (GValue* value, gpointer v_object) {
+void
+publishing_piwigo_value_take_size_entry (GValue* value,
+                                         gpointer v_object)
+{
 	PublishingPiwigoSizeEntry * old;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_SIZE_ENTRY));
@@ -2148,38 +2577,44 @@ void publishing_piwigo_value_take_size_entry (GValue* value, gpointer v_object)
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 2152 "PiwigoPublishing.c"
+#line 2581 "PiwigoPublishing.c"
 	} else {
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 2156 "PiwigoPublishing.c"
+#line 2585 "PiwigoPublishing.c"
 	}
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (old) {
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_size_entry_unref (old);
-#line 2162 "PiwigoPublishing.c"
+#line 2591 "PiwigoPublishing.c"
 	}
 }
 
 
-static void publishing_piwigo_size_entry_class_init (PublishingPiwigoSizeEntryClass * klass) {
+static void
+publishing_piwigo_size_entry_class_init (PublishingPiwigoSizeEntryClass * klass)
+{
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_size_entry_parent_class = g_type_class_peek_parent (klass);
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	((PublishingPiwigoSizeEntryClass *) klass)->finalize = publishing_piwigo_size_entry_finalize;
-#line 2172 "PiwigoPublishing.c"
+#line 2603 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_size_entry_instance_init (PublishingPiwigoSizeEntry * self) {
+static void
+publishing_piwigo_size_entry_instance_init (PublishingPiwigoSizeEntry * self)
+{
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->ref_count = 1;
-#line 2179 "PiwigoPublishing.c"
+#line 2612 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_size_entry_finalize (PublishingPiwigoSizeEntry * obj) {
+static void
+publishing_piwigo_size_entry_finalize (PublishingPiwigoSizeEntry * obj)
+{
 	PublishingPiwigoSizeEntry * self;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_SIZE_ENTRY, PublishingPiwigoSizeEntry);
@@ -2187,11 +2622,13 @@ static void publishing_piwigo_size_entry_finalize (PublishingPiwigoSizeEntry * o
 	g_signal_handlers_destroy (self);
 #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->name);
-#line 2191 "PiwigoPublishing.c"
+#line 2626 "PiwigoPublishing.c"
 }
 
 
-GType publishing_piwigo_size_entry_get_type (void) {
+GType
+publishing_piwigo_size_entry_get_type (void)
+{
 	static volatile gsize publishing_piwigo_size_entry_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_piwigo_size_entry_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { publishing_piwigo_value_size_entry_init, publishing_piwigo_value_size_entry_free_value, publishing_piwigo_value_size_entry_copy_value, publishing_piwigo_value_size_entry_peek_pointer, "p", publishing_piwigo_value_size_entry_collect_value, "p", publishing_piwigo_value_size_entry_lcopy_value };
@@ -2205,18 +2642,22 @@ GType publishing_piwigo_size_entry_get_type (void) {
 }
 
 
-gpointer publishing_piwigo_size_entry_ref (gpointer instance) {
+gpointer
+publishing_piwigo_size_entry_ref (gpointer instance)
+{
 	PublishingPiwigoSizeEntry * self;
 	self = instance;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return instance;
-#line 2216 "PiwigoPublishing.c"
+#line 2655 "PiwigoPublishing.c"
 }
 
 
-void publishing_piwigo_size_entry_unref (gpointer instance) {
+void
+publishing_piwigo_size_entry_unref (gpointer instance)
+{
 	PublishingPiwigoSizeEntry * self;
 	self = instance;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -2225,126 +2666,155 @@ void publishing_piwigo_size_entry_unref (gpointer instance) {
 		PUBLISHING_PIWIGO_SIZE_ENTRY_GET_CLASS (self)->finalize (self);
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2229 "PiwigoPublishing.c"
+#line 2670 "PiwigoPublishing.c"
 	}
 }
 
 
-PublishingPiwigoPublishingParameters* publishing_piwigo_publishing_parameters_construct (GType object_type) {
+PublishingPiwigoPublishingParameters*
+publishing_piwigo_publishing_parameters_construct (GType object_type)
+{
 	PublishingPiwigoPublishingParameters* self = NULL;
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = (PublishingPiwigoPublishingParameters*) g_type_create_instance (object_type);
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 2240 "PiwigoPublishing.c"
+#line 2683 "PiwigoPublishing.c"
 }
 
 
-PublishingPiwigoPublishingParameters* publishing_piwigo_publishing_parameters_new (void) {
+PublishingPiwigoPublishingParameters*
+publishing_piwigo_publishing_parameters_new (void)
+{
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_publishing_parameters_construct (PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS);
-#line 2247 "PiwigoPublishing.c"
+#line 2692 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_value_publishing_parameters_init (GValue* value) {
+static void
+publishing_piwigo_value_publishing_parameters_init (GValue* value)
+{
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 2254 "PiwigoPublishing.c"
+#line 2701 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_value_publishing_parameters_free_value (GValue* value) {
+static void
+publishing_piwigo_value_publishing_parameters_free_value (GValue* value)
+{
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (value->data[0].v_pointer) {
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_publishing_parameters_unref (value->data[0].v_pointer);
-#line 2263 "PiwigoPublishing.c"
+#line 2712 "PiwigoPublishing.c"
 	}
 }
 
 
-static void publishing_piwigo_value_publishing_parameters_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_piwigo_value_publishing_parameters_copy_value (const GValue* src_value,
+                                                          GValue* dest_value)
+{
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (src_value->data[0].v_pointer) {
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_piwigo_publishing_parameters_ref (src_value->data[0].v_pointer);
-#line 2273 "PiwigoPublishing.c"
+#line 2725 "PiwigoPublishing.c"
 	} else {
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2277 "PiwigoPublishing.c"
+#line 2729 "PiwigoPublishing.c"
 	}
 }
 
 
-static gpointer publishing_piwigo_value_publishing_parameters_peek_pointer (const GValue* value) {
+static gpointer
+publishing_piwigo_value_publishing_parameters_peek_pointer (const GValue* value)
+{
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return value->data[0].v_pointer;
-#line 2285 "PiwigoPublishing.c"
+#line 2739 "PiwigoPublishing.c"
 }
 
 
-static gchar* publishing_piwigo_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_piwigo_value_publishing_parameters_collect_value (GValue* value,
+                                                             guint n_collect_values,
+                                                             GTypeCValue* collect_values,
+                                                             guint collect_flags)
+{
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 2292 "PiwigoPublishing.c"
+#line 2751 "PiwigoPublishing.c"
 		PublishingPiwigoPublishingParameters * object;
 		object = collect_values[0].v_pointer;
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2299 "PiwigoPublishing.c"
+#line 2758 "PiwigoPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2303 "PiwigoPublishing.c"
+#line 2762 "PiwigoPublishing.c"
 		}
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = publishing_piwigo_publishing_parameters_ref (object);
-#line 2307 "PiwigoPublishing.c"
+#line 2766 "PiwigoPublishing.c"
 	} else {
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 2311 "PiwigoPublishing.c"
+#line 2770 "PiwigoPublishing.c"
 	}
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return NULL;
-#line 2315 "PiwigoPublishing.c"
+#line 2774 "PiwigoPublishing.c"
 }
 
 
-static gchar* publishing_piwigo_value_publishing_parameters_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_piwigo_value_publishing_parameters_lcopy_value (const GValue* value,
+                                                           guint n_collect_values,
+                                                           GTypeCValue* collect_values,
+                                                           guint collect_flags)
+{
 	PublishingPiwigoPublishingParameters ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!object_p) {
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2326 "PiwigoPublishing.c"
+#line 2790 "PiwigoPublishing.c"
 	}
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = NULL;
-#line 2332 "PiwigoPublishing.c"
+#line 2796 "PiwigoPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2336 "PiwigoPublishing.c"
+#line 2800 "PiwigoPublishing.c"
 	} else {
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = publishing_piwigo_publishing_parameters_ref (value->data[0].v_pointer);
-#line 2340 "PiwigoPublishing.c"
+#line 2804 "PiwigoPublishing.c"
 	}
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return NULL;
-#line 2344 "PiwigoPublishing.c"
+#line 2808 "PiwigoPublishing.c"
 }
 
 
-GParamSpec* publishing_piwigo_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_piwigo_param_spec_publishing_parameters (const gchar* name,
+                                                    const gchar* nick,
+                                                    const gchar* blurb,
+                                                    GType object_type,
+                                                    GParamFlags flags)
+{
 	PublishingPiwigoParamSpecPublishingParameters* spec;
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS), NULL);
@@ -2354,20 +2824,25 @@ GParamSpec* publishing_piwigo_param_spec_publishing_parameters (const gchar* nam
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 2358 "PiwigoPublishing.c"
+#line 2828 "PiwigoPublishing.c"
 }
 
 
-gpointer publishing_piwigo_value_get_publishing_parameters (const GValue* value) {
+gpointer
+publishing_piwigo_value_get_publishing_parameters (const GValue* value)
+{
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS), NULL);
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return value->data[0].v_pointer;
-#line 2367 "PiwigoPublishing.c"
+#line 2839 "PiwigoPublishing.c"
 }
 
 
-void publishing_piwigo_value_set_publishing_parameters (GValue* value, gpointer v_object) {
+void
+publishing_piwigo_value_set_publishing_parameters (GValue* value,
+                                                   gpointer v_object)
+{
 	PublishingPiwigoPublishingParameters * old;
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS));
@@ -2383,22 +2858,25 @@ void publishing_piwigo_value_set_publishing_parameters (GValue* value, gpointer
 		value->data[0].v_pointer = v_object;
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_publishing_parameters_ref (value->data[0].v_pointer);
-#line 2387 "PiwigoPublishing.c"
+#line 2862 "PiwigoPublishing.c"
 	} else {
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 2391 "PiwigoPublishing.c"
+#line 2866 "PiwigoPublishing.c"
 	}
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (old) {
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_publishing_parameters_unref (old);
-#line 2397 "PiwigoPublishing.c"
+#line 2872 "PiwigoPublishing.c"
 	}
 }
 
 
-void publishing_piwigo_value_take_publishing_parameters (GValue* value, gpointer v_object) {
+void
+publishing_piwigo_value_take_publishing_parameters (GValue* value,
+                                                    gpointer v_object)
+{
 	PublishingPiwigoPublishingParameters * old;
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS));
@@ -2412,31 +2890,35 @@ void publishing_piwigo_value_take_publishing_parameters (GValue* value, gpointer
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 2416 "PiwigoPublishing.c"
+#line 2894 "PiwigoPublishing.c"
 	} else {
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 2420 "PiwigoPublishing.c"
+#line 2898 "PiwigoPublishing.c"
 	}
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (old) {
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_publishing_parameters_unref (old);
-#line 2426 "PiwigoPublishing.c"
+#line 2904 "PiwigoPublishing.c"
 	}
 }
 
 
-static void publishing_piwigo_publishing_parameters_class_init (PublishingPiwigoPublishingParametersClass * klass) {
+static void
+publishing_piwigo_publishing_parameters_class_init (PublishingPiwigoPublishingParametersClass * klass)
+{
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_parameters_parent_class = g_type_class_peek_parent (klass);
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	((PublishingPiwigoPublishingParametersClass *) klass)->finalize = publishing_piwigo_publishing_parameters_finalize;
-#line 2436 "PiwigoPublishing.c"
+#line 2916 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_publishing_parameters_instance_init (PublishingPiwigoPublishingParameters * self) {
+static void
+publishing_piwigo_publishing_parameters_instance_init (PublishingPiwigoPublishingParameters * self)
+{
 #line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->category = NULL;
 #line 116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -2449,11 +2931,13 @@ static void publishing_piwigo_publishing_parameters_instance_init (PublishingPiw
 	self->no_upload_tags = FALSE;
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->ref_count = 1;
-#line 2453 "PiwigoPublishing.c"
+#line 2935 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_publishing_parameters_finalize (PublishingPiwigoPublishingParameters * obj) {
+static void
+publishing_piwigo_publishing_parameters_finalize (PublishingPiwigoPublishingParameters * obj)
+{
 	PublishingPiwigoPublishingParameters * self;
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS, PublishingPiwigoPublishingParameters);
@@ -2465,11 +2949,13 @@ static void publishing_piwigo_publishing_parameters_finalize (PublishingPiwigoPu
 	_publishing_piwigo_permission_level_unref0 (self->perm_level);
 #line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_piwigo_size_entry_unref0 (self->photo_size);
-#line 2469 "PiwigoPublishing.c"
+#line 2953 "PiwigoPublishing.c"
 }
 
 
-GType publishing_piwigo_publishing_parameters_get_type (void) {
+GType
+publishing_piwigo_publishing_parameters_get_type (void)
+{
 	static volatile gsize publishing_piwigo_publishing_parameters_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_piwigo_publishing_parameters_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { publishing_piwigo_value_publishing_parameters_init, publishing_piwigo_value_publishing_parameters_free_value, publishing_piwigo_value_publishing_parameters_copy_value, publishing_piwigo_value_publishing_parameters_peek_pointer, "p", publishing_piwigo_value_publishing_parameters_collect_value, "p", publishing_piwigo_value_publishing_parameters_lcopy_value };
@@ -2483,18 +2969,22 @@ GType publishing_piwigo_publishing_parameters_get_type (void) {
 }
 
 
-gpointer publishing_piwigo_publishing_parameters_ref (gpointer instance) {
+gpointer
+publishing_piwigo_publishing_parameters_ref (gpointer instance)
+{
 	PublishingPiwigoPublishingParameters * self;
 	self = instance;
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return instance;
-#line 2494 "PiwigoPublishing.c"
+#line 2982 "PiwigoPublishing.c"
 }
 
 
-void publishing_piwigo_publishing_parameters_unref (gpointer instance) {
+void
+publishing_piwigo_publishing_parameters_unref (gpointer instance)
+{
 	PublishingPiwigoPublishingParameters * self;
 	self = instance;
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -2503,18 +2993,20 @@ void publishing_piwigo_publishing_parameters_unref (gpointer instance) {
 		PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self);
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2507 "PiwigoPublishing.c"
+#line 2997 "PiwigoPublishing.c"
 	}
 }
 
 
-PublishingPiwigoPiwigoPublisher* publishing_piwigo_piwigo_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) {
+PublishingPiwigoPiwigoPublisher*
+publishing_piwigo_piwigo_publisher_construct (GType object_type,
+                                              SpitPublishingService* service,
+                                              SpitPublishingPluginHost* host)
+{
 	PublishingPiwigoPiwigoPublisher * self = NULL;
 	SpitPublishingService* _tmp0_;
-	SpitPublishingService* _tmp1_;
-	SpitPublishingPluginHost* _tmp2_;
-	SpitPublishingPluginHost* _tmp3_;
-	PublishingPiwigoSession* _tmp4_;
+	SpitPublishingPluginHost* _tmp1_;
+	PublishingPiwigoSession* _tmp2_;
 #line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
 #line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -2524,41 +3016,42 @@ PublishingPiwigoPiwigoPublisher* publishing_piwigo_piwigo_publisher_construct (G
 #line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_debug ("PiwigoPublishing.vala:137: PiwigoPublisher instantiated.");
 #line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = service;
-#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_tmp0_ = _g_object_ref0 (service);
 #line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->service);
 #line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->service = _tmp1_;
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = host;
+	self->priv->service = _tmp0_;
 #line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp3_ = _g_object_ref0 (_tmp2_);
+	_tmp1_ = _g_object_ref0 (host);
 #line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->host);
 #line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->host = _tmp3_;
+	self->priv->host = _tmp1_;
 #line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp4_ = publishing_piwigo_session_new ();
+	_tmp2_ = publishing_piwigo_session_new ();
 #line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
 #line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->session = _tmp4_;
+	self->priv->session = _tmp2_;
 #line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 2551 "PiwigoPublishing.c"
+#line 3039 "PiwigoPublishing.c"
 }
 
 
-PublishingPiwigoPiwigoPublisher* publishing_piwigo_piwigo_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
+PublishingPiwigoPiwigoPublisher*
+publishing_piwigo_piwigo_publisher_new (SpitPublishingService* service,
+                                        SpitPublishingPluginHost* host)
+{
 #line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_piwigo_publisher_construct (PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, service, host);
-#line 2558 "PiwigoPublishing.c"
+#line 3049 "PiwigoPublishing.c"
 }
 
 
-static SpitPublishingService* publishing_piwigo_piwigo_publisher_real_get_service (SpitPublishingPublisher* base) {
+static SpitPublishingService*
+publishing_piwigo_piwigo_publisher_real_get_service (SpitPublishingPublisher* base)
+{
 	PublishingPiwigoPiwigoPublisher * self;
 	SpitPublishingService* result = NULL;
 	SpitPublishingService* _tmp0_;
@@ -2573,11 +3066,13 @@ static SpitPublishingService* publishing_piwigo_piwigo_publisher_real_get_servic
 	result = _tmp1_;
 #line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2577 "PiwigoPublishing.c"
+#line 3070 "PiwigoPublishing.c"
 }
 
 
-SpitPublishingPluginHost* publishing_piwigo_piwigo_publisher_get_host (PublishingPiwigoPiwigoPublisher* self) {
+SpitPublishingPluginHost*
+publishing_piwigo_piwigo_publisher_get_host (PublishingPiwigoPiwigoPublisher* self)
+{
 	SpitPublishingPluginHost* result = NULL;
 	SpitPublishingPluginHost* _tmp0_;
 	SpitPublishingPluginHost* _tmp1_;
@@ -2591,11 +3086,13 @@ SpitPublishingPluginHost* publishing_piwigo_piwigo_publisher_get_host (Publishin
 	result = _tmp1_;
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2595 "PiwigoPublishing.c"
+#line 3090 "PiwigoPublishing.c"
 }
 
 
-static gboolean publishing_piwigo_piwigo_publisher_real_is_running (SpitPublishingPublisher* base) {
+static gboolean
+publishing_piwigo_piwigo_publisher_real_is_running (SpitPublishingPublisher* base)
+{
 	PublishingPiwigoPiwigoPublisher * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_;
@@ -2607,117 +3104,110 @@ static gboolean publishing_piwigo_piwigo_publisher_real_is_running (SpitPublishi
 	result = _tmp0_;
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2611 "PiwigoPublishing.c"
+#line 3108 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_piwigo_publisher_real_start (SpitPublishingPublisher* base) {
+static void
+publishing_piwigo_piwigo_publisher_real_start (SpitPublishingPublisher* base)
+{
 	PublishingPiwigoPiwigoPublisher * self;
-	gboolean _tmp0_;
-	PublishingPiwigoSession* _tmp1_;
-	gboolean _tmp2_;
+	PublishingPiwigoSession* _tmp0_;
 #line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, PublishingPiwigoPiwigoPublisher);
 #line 158 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 158 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (_tmp0_) {
+	if (spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 2628 "PiwigoPublishing.c"
+#line 3123 "PiwigoPublishing.c"
 	}
 #line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_debug ("PiwigoPublishing.vala:161: PiwigoPublisher: starting interaction.");
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->running = TRUE;
 #line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = self->priv->session;
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
+	_tmp0_ = self->priv->session;
 #line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (_tmp2_) {
+	if (publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
 #line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_debug ("PiwigoPublishing.vala:166: PiwigoPublisher: session is authenticated.");
 #line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_piwigo_publisher_do_fetch_categories (self);
-#line 2644 "PiwigoPublishing.c"
+#line 3137 "PiwigoPublishing.c"
 	} else {
 		gchar* persistent_url = NULL;
-		gchar* _tmp3_;
+		gchar* _tmp1_;
 		gchar* persistent_username = NULL;
-		gchar* _tmp4_;
+		gchar* _tmp2_;
 		gchar* persistent_password = NULL;
-		gchar* _tmp5_;
-		gboolean _tmp6_ = FALSE;
-		gboolean _tmp7_ = FALSE;
-		const gchar* _tmp8_;
+		gchar* _tmp3_;
+		gboolean _tmp4_ = FALSE;
+		gboolean _tmp5_ = FALSE;
+		const gchar* _tmp6_;
 #line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_debug ("PiwigoPublishing.vala:169: PiwigoPublisher: session is not authenticat" \
 "ed.");
 #line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp3_ = publishing_piwigo_piwigo_publisher_get_persistent_url (self);
+		_tmp1_ = publishing_piwigo_piwigo_publisher_get_persistent_url (self);
 #line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		persistent_url = _tmp3_;
+		persistent_url = _tmp1_;
 #line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp4_ = publishing_piwigo_piwigo_publisher_get_persistent_username (self);
+		_tmp2_ = publishing_piwigo_piwigo_publisher_get_persistent_username (self);
 #line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		persistent_username = _tmp4_;
+		persistent_username = _tmp2_;
 #line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp5_ = publishing_piwigo_piwigo_publisher_get_persistent_password (self);
+		_tmp3_ = publishing_piwigo_piwigo_publisher_get_persistent_password (self);
 #line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		persistent_password = _tmp5_;
+		persistent_password = _tmp3_;
 #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp8_ = persistent_url;
+		_tmp6_ = persistent_url;
 #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		if (_tmp8_ != NULL) {
-#line 2673 "PiwigoPublishing.c"
-			const gchar* _tmp9_;
+		if (_tmp6_ != NULL) {
+#line 3166 "PiwigoPublishing.c"
+			const gchar* _tmp7_;
 #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp9_ = persistent_username;
+			_tmp7_ = persistent_username;
 #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp7_ = _tmp9_ != NULL;
-#line 2679 "PiwigoPublishing.c"
+			_tmp5_ = _tmp7_ != NULL;
+#line 3172 "PiwigoPublishing.c"
 		} else {
 #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp7_ = FALSE;
-#line 2683 "PiwigoPublishing.c"
+			_tmp5_ = FALSE;
+#line 3176 "PiwigoPublishing.c"
 		}
 #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		if (_tmp7_) {
-#line 2687 "PiwigoPublishing.c"
-			const gchar* _tmp10_;
+		if (_tmp5_) {
+#line 3180 "PiwigoPublishing.c"
+			const gchar* _tmp8_;
 #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp10_ = persistent_password;
+			_tmp8_ = persistent_password;
 #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp6_ = _tmp10_ != NULL;
-#line 2693 "PiwigoPublishing.c"
+			_tmp4_ = _tmp8_ != NULL;
+#line 3186 "PiwigoPublishing.c"
 		} else {
 #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp6_ = FALSE;
-#line 2697 "PiwigoPublishing.c"
+			_tmp4_ = FALSE;
+#line 3190 "PiwigoPublishing.c"
 		}
 #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		if (_tmp6_) {
-#line 2701 "PiwigoPublishing.c"
+		if (_tmp4_) {
+#line 3194 "PiwigoPublishing.c"
+			const gchar* _tmp9_;
+			const gchar* _tmp10_;
 			const gchar* _tmp11_;
-			const gchar* _tmp12_;
-			const gchar* _tmp13_;
-			gboolean _tmp14_;
 #line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp11_ = persistent_url;
+			_tmp9_ = persistent_url;
 #line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp12_ = persistent_username;
+			_tmp10_ = persistent_username;
 #line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp13_ = persistent_password;
+			_tmp11_ = persistent_password;
 #line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp14_ = publishing_piwigo_piwigo_publisher_get_remember_password (self);
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			publishing_piwigo_piwigo_publisher_do_network_login (self, _tmp11_, _tmp12_, _tmp13_, _tmp14_);
-#line 2716 "PiwigoPublishing.c"
+			publishing_piwigo_piwigo_publisher_do_network_login (self, _tmp9_, _tmp10_, _tmp11_, publishing_piwigo_piwigo_publisher_get_remember_password (self));
+#line 3206 "PiwigoPublishing.c"
 		} else {
 #line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			publishing_piwigo_piwigo_publisher_do_show_authentication_pane (self, PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_INTRO);
-#line 2720 "PiwigoPublishing.c"
+#line 3210 "PiwigoPublishing.c"
 		}
 #line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (persistent_password);
@@ -2725,22 +3215,26 @@ static void publishing_piwigo_piwigo_publisher_real_start (SpitPublishingPublish
 		_g_free0 (persistent_username);
 #line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (persistent_url);
-#line 2728 "PiwigoPublishing.c"
+#line 3218 "PiwigoPublishing.c"
 	}
 }
 
 
-static void publishing_piwigo_piwigo_publisher_real_stop (SpitPublishingPublisher* base) {
+static void
+publishing_piwigo_piwigo_publisher_real_stop (SpitPublishingPublisher* base)
+{
 	PublishingPiwigoPiwigoPublisher * self;
 #line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, PublishingPiwigoPiwigoPublisher);
 #line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->running = FALSE;
-#line 2739 "PiwigoPublishing.c"
+#line 3231 "PiwigoPublishing.c"
 }
 
 
-gchar* publishing_piwigo_piwigo_publisher_get_persistent_url (PublishingPiwigoPiwigoPublisher* self) {
+gchar*
+publishing_piwigo_piwigo_publisher_get_persistent_url (PublishingPiwigoPiwigoPublisher* self)
+{
 	gchar* result = NULL;
 	SpitPublishingPluginHost* _tmp0_;
 	gchar* _tmp1_;
@@ -2754,13 +3248,15 @@ gchar* publishing_piwigo_piwigo_publisher_get_persistent_url (PublishingPiwigoPi
 	result = _tmp1_;
 #line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2757 "PiwigoPublishing.c"
+#line 3251 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_piwigo_publisher_set_persistent_url (PublishingPiwigoPiwigoPublisher* self, const gchar* url) {
+static void
+publishing_piwigo_piwigo_publisher_set_persistent_url (PublishingPiwigoPiwigoPublisher* self,
+                                                       const gchar* url)
+{
 	SpitPublishingPluginHost* _tmp0_;
-	const gchar* _tmp1_;
 #line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -2768,14 +3264,14 @@ static void publishing_piwigo_piwigo_publisher_set_persistent_url (PublishingPiw
 #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
 #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = url;
-#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "url", _tmp1_);
-#line 2774 "PiwigoPublishing.c"
+	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "url", url);
+#line 3268 "PiwigoPublishing.c"
 }
 
 
-gchar* publishing_piwigo_piwigo_publisher_get_persistent_username (PublishingPiwigoPiwigoPublisher* self) {
+gchar*
+publishing_piwigo_piwigo_publisher_get_persistent_username (PublishingPiwigoPiwigoPublisher* self)
+{
 	gchar* result = NULL;
 	SpitPublishingPluginHost* _tmp0_;
 	gchar* _tmp1_;
@@ -2789,13 +3285,15 @@ gchar* publishing_piwigo_piwigo_publisher_get_persistent_username (PublishingPiw
 	result = _tmp1_;
 #line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2792 "PiwigoPublishing.c"
+#line 3288 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_piwigo_publisher_set_persistent_username (PublishingPiwigoPiwigoPublisher* self, const gchar* username) {
+static void
+publishing_piwigo_piwigo_publisher_set_persistent_username (PublishingPiwigoPiwigoPublisher* self,
+                                                            const gchar* username)
+{
 	SpitPublishingPluginHost* _tmp0_;
-	const gchar* _tmp1_;
 #line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -2803,14 +3301,14 @@ static void publishing_piwigo_piwigo_publisher_set_persistent_username (Publishi
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = username;
-#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "username", _tmp1_);
-#line 2809 "PiwigoPublishing.c"
+	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "username", username);
+#line 3305 "PiwigoPublishing.c"
 }
 
 
-gchar* publishing_piwigo_piwigo_publisher_get_persistent_password (PublishingPiwigoPiwigoPublisher* self) {
+gchar*
+publishing_piwigo_piwigo_publisher_get_persistent_password (PublishingPiwigoPiwigoPublisher* self)
+{
 	gchar* result = NULL;
 	SpitPublishingPluginHost* _tmp0_;
 	gchar* _tmp1_;
@@ -2824,253 +3322,246 @@ gchar* publishing_piwigo_piwigo_publisher_get_persistent_password (PublishingPiw
 	result = _tmp1_;
 #line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2827 "PiwigoPublishing.c"
+#line 3325 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_piwigo_publisher_set_persistent_password (PublishingPiwigoPiwigoPublisher* self, const gchar* password) {
+static void
+publishing_piwigo_piwigo_publisher_set_persistent_password (PublishingPiwigoPiwigoPublisher* self,
+                                                            const gchar* password)
+{
 	SpitPublishingPluginHost* _tmp0_;
-	const gchar* _tmp1_;
 #line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
 #line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = password;
-#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "password", _tmp1_);
-#line 2842 "PiwigoPublishing.c"
+	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "password", password);
+#line 3340 "PiwigoPublishing.c"
 }
 
 
-gboolean publishing_piwigo_piwigo_publisher_get_remember_password (PublishingPiwigoPiwigoPublisher* self) {
+gboolean
+publishing_piwigo_piwigo_publisher_get_remember_password (PublishingPiwigoPiwigoPublisher* self)
+{
 	gboolean result = FALSE;
 	SpitPublishingPluginHost* _tmp0_;
-	gboolean _tmp1_;
 #line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), FALSE);
 #line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
 #line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "remember-password", FALSE);
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	result = _tmp1_;
+	result = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "remember-password", FALSE);
 #line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2860 "PiwigoPublishing.c"
+#line 3357 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_piwigo_publisher_set_remember_password (PublishingPiwigoPiwigoPublisher* self, gboolean remember_password) {
+static void
+publishing_piwigo_piwigo_publisher_set_remember_password (PublishingPiwigoPiwigoPublisher* self,
+                                                          gboolean remember_password)
+{
 	SpitPublishingPluginHost* _tmp0_;
-	gboolean _tmp1_;
 #line 215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
 #line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = remember_password;
-#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "remember-password", _tmp1_);
-#line 2875 "PiwigoPublishing.c"
+	spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "remember-password", remember_password);
+#line 3372 "PiwigoPublishing.c"
 }
 
 
-gint publishing_piwigo_piwigo_publisher_get_last_category (PublishingPiwigoPiwigoPublisher* self) {
+gint
+publishing_piwigo_piwigo_publisher_get_last_category (PublishingPiwigoPiwigoPublisher* self)
+{
 	gint result = 0;
 	SpitPublishingPluginHost* _tmp0_;
-	gint _tmp1_;
 #line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), 0);
 #line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
 #line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-category", -1);
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	result = _tmp1_;
+	result = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-category", -1);
 #line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2893 "PiwigoPublishing.c"
+#line 3389 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_piwigo_publisher_set_last_category (PublishingPiwigoPiwigoPublisher* self, gint last_category) {
+static void
+publishing_piwigo_piwigo_publisher_set_last_category (PublishingPiwigoPiwigoPublisher* self,
+                                                      gint last_category)
+{
 	SpitPublishingPluginHost* _tmp0_;
-	gint _tmp1_;
 #line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
 #line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = last_category;
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-category", _tmp1_);
-#line 2908 "PiwigoPublishing.c"
+	spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-category", last_category);
+#line 3404 "PiwigoPublishing.c"
 }
 
 
-gint publishing_piwigo_piwigo_publisher_get_last_permission_level (PublishingPiwigoPiwigoPublisher* self) {
+gint
+publishing_piwigo_piwigo_publisher_get_last_permission_level (PublishingPiwigoPiwigoPublisher* self)
+{
 	gint result = 0;
 	SpitPublishingPluginHost* _tmp0_;
-	gint _tmp1_;
 #line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), 0);
 #line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
 #line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-permission-level", -1);
-#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	result = _tmp1_;
+	result = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-permission-level", -1);
 #line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2926 "PiwigoPublishing.c"
+#line 3421 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_piwigo_publisher_set_last_permission_level (PublishingPiwigoPiwigoPublisher* self, gint last_permission_level) {
+static void
+publishing_piwigo_piwigo_publisher_set_last_permission_level (PublishingPiwigoPiwigoPublisher* self,
+                                                              gint last_permission_level)
+{
 	SpitPublishingPluginHost* _tmp0_;
-	gint _tmp1_;
 #line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
 #line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = last_permission_level;
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-permission-level", _tmp1_);
-#line 2941 "PiwigoPublishing.c"
+	spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-permission-level", last_permission_level);
+#line 3436 "PiwigoPublishing.c"
 }
 
 
-gint publishing_piwigo_piwigo_publisher_get_last_photo_size (PublishingPiwigoPiwigoPublisher* self) {
+gint
+publishing_piwigo_piwigo_publisher_get_last_photo_size (PublishingPiwigoPiwigoPublisher* self)
+{
 	gint result = 0;
 	SpitPublishingPluginHost* _tmp0_;
-	gint _tmp1_;
 #line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), 0);
 #line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
 #line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-photo-size", -1);
-#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	result = _tmp1_;
+	result = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-photo-size", -1);
 #line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2959 "PiwigoPublishing.c"
+#line 3453 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_piwigo_publisher_set_last_photo_size (PublishingPiwigoPiwigoPublisher* self, gint last_photo_size) {
+static void
+publishing_piwigo_piwigo_publisher_set_last_photo_size (PublishingPiwigoPiwigoPublisher* self,
+                                                        gint last_photo_size)
+{
 	SpitPublishingPluginHost* _tmp0_;
-	gint _tmp1_;
 #line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
 #line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = last_photo_size;
-#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-photo-size", _tmp1_);
-#line 2974 "PiwigoPublishing.c"
+	spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-photo-size", last_photo_size);
+#line 3468 "PiwigoPublishing.c"
 }
 
 
-static gboolean publishing_piwigo_piwigo_publisher_get_last_title_as_comment (PublishingPiwigoPiwigoPublisher* self) {
+static gboolean
+publishing_piwigo_piwigo_publisher_get_last_title_as_comment (PublishingPiwigoPiwigoPublisher* self)
+{
 	gboolean result = FALSE;
 	SpitPublishingPluginHost* _tmp0_;
-	gboolean _tmp1_;
 #line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), FALSE);
 #line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
 #line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-title-as-comment", FALSE);
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	result = _tmp1_;
+	result = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-title-as-comment", FALSE);
 #line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2992 "PiwigoPublishing.c"
+#line 3485 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_piwigo_publisher_set_last_title_as_comment (PublishingPiwigoPiwigoPublisher* self, gboolean title_as_comment) {
+static void
+publishing_piwigo_piwigo_publisher_set_last_title_as_comment (PublishingPiwigoPiwigoPublisher* self,
+                                                              gboolean title_as_comment)
+{
 	SpitPublishingPluginHost* _tmp0_;
-	gboolean _tmp1_;
 #line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
 #line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = title_as_comment;
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-title-as-comment", _tmp1_);
-#line 3007 "PiwigoPublishing.c"
+	spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-title-as-comment", title_as_comment);
+#line 3500 "PiwigoPublishing.c"
 }
 
 
-static gboolean publishing_piwigo_piwigo_publisher_get_last_no_upload_tags (PublishingPiwigoPiwigoPublisher* self) {
+static gboolean
+publishing_piwigo_piwigo_publisher_get_last_no_upload_tags (PublishingPiwigoPiwigoPublisher* self)
+{
 	gboolean result = FALSE;
 	SpitPublishingPluginHost* _tmp0_;
-	gboolean _tmp1_;
 #line 251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), FALSE);
 #line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
 #line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-no-upload-tags", FALSE);
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	result = _tmp1_;
+	result = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-no-upload-tags", FALSE);
 #line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 3025 "PiwigoPublishing.c"
+#line 3517 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_piwigo_publisher_set_last_no_upload_tags (PublishingPiwigoPiwigoPublisher* self, gboolean no_upload_tags) {
+static void
+publishing_piwigo_piwigo_publisher_set_last_no_upload_tags (PublishingPiwigoPiwigoPublisher* self,
+                                                            gboolean no_upload_tags)
+{
 	SpitPublishingPluginHost* _tmp0_;
-	gboolean _tmp1_;
 #line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
 #line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = no_upload_tags;
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-no-upload-tags", _tmp1_);
-#line 3040 "PiwigoPublishing.c"
+	spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-no-upload-tags", no_upload_tags);
+#line 3532 "PiwigoPublishing.c"
 }
 
 
-static gboolean publishing_piwigo_piwigo_publisher_get_metadata_removal_choice (PublishingPiwigoPiwigoPublisher* self) {
+static gboolean
+publishing_piwigo_piwigo_publisher_get_metadata_removal_choice (PublishingPiwigoPiwigoPublisher* self)
+{
 	gboolean result = FALSE;
 	SpitPublishingPluginHost* _tmp0_;
-	gboolean _tmp1_;
 #line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), FALSE);
 #line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
 #line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", FALSE);
-#line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	result = _tmp1_;
+	result = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", FALSE);
 #line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 3058 "PiwigoPublishing.c"
+#line 3549 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_piwigo_publisher_set_metadata_removal_choice (PublishingPiwigoPiwigoPublisher* self, gboolean strip_metadata) {
+static void
+publishing_piwigo_piwigo_publisher_set_metadata_removal_choice (PublishingPiwigoPiwigoPublisher* self,
+                                                                gboolean strip_metadata)
+{
 	SpitPublishingPluginHost* _tmp0_;
-	gboolean _tmp1_;
 #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
 #line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = strip_metadata;
-#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", _tmp1_);
-#line 3073 "PiwigoPublishing.c"
+	spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", strip_metadata);
+#line 3564 "PiwigoPublishing.c"
 }
 
 
@@ -3085,22 +3576,31 @@ static void publishing_piwigo_piwigo_publisher_set_metadata_removal_choice (Publ
      *
      * @param mode the mode for the authentication pane
      */
-static void _publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clicked_publishing_piwigo_authentication_pane_login (PublishingPiwigoAuthenticationPane* _sender, const gchar* url, const gchar* user, const gchar* password, gboolean remember_password, gpointer self) {
+static void
+_publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clicked_publishing_piwigo_authentication_pane_login (PublishingPiwigoAuthenticationPane* _sender,
+                                                                                                                      const gchar* url,
+                                                                                                                      const gchar* user,
+                                                                                                                      const gchar* password,
+                                                                                                                      gboolean remember_password,
+                                                                                                                      gpointer self)
+{
 #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clicked ((PublishingPiwigoPiwigoPublisher*) self, url, user, password, remember_password);
-#line 3091 "PiwigoPublishing.c"
+#line 3589 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_piwigo_publisher_do_show_authentication_pane (PublishingPiwigoPiwigoPublisher* self, PublishingPiwigoAuthenticationPaneMode mode) {
+static void
+publishing_piwigo_piwigo_publisher_do_show_authentication_pane (PublishingPiwigoPiwigoPublisher* self,
+                                                                PublishingPiwigoAuthenticationPaneMode mode)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	PublishingPiwigoAuthenticationPane* authentication_pane = NULL;
-	PublishingPiwigoAuthenticationPaneMode _tmp1_;
-	PublishingPiwigoAuthenticationPane* _tmp2_;
+	PublishingPiwigoAuthenticationPane* _tmp1_;
+	SpitPublishingPluginHost* _tmp2_;
 	SpitPublishingPluginHost* _tmp3_;
-	SpitPublishingPluginHost* _tmp4_;
+	GtkWidget* _tmp4_;
 	GtkWidget* _tmp5_;
-	GtkWidget* _tmp6_;
 #line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3110,34 +3610,34 @@ static void publishing_piwigo_piwigo_publisher_do_show_authentication_pane (Publ
 #line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
 #line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = mode;
-#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = publishing_piwigo_authentication_pane_new (self, _tmp1_);
+	_tmp1_ = publishing_piwigo_authentication_pane_new (self, mode);
 #line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	authentication_pane = _tmp2_;
+	authentication_pane = _tmp1_;
 #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (authentication_pane, "login", (GCallback) _publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clicked_publishing_piwigo_authentication_pane_login, self, 0);
 #line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp3_ = self->priv->host;
+	_tmp2_ = self->priv->host;
 #line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	spit_publishing_plugin_host_install_dialog_pane (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (authentication_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
+	spit_publishing_plugin_host_install_dialog_pane (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (authentication_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
 #line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp4_ = self->priv->host;
+	_tmp3_ = self->priv->host;
 #line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp5_ = shotwell_plugins_common_builder_pane_get_default_widget (G_TYPE_CHECK_INSTANCE_CAST (authentication_pane, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
+	_tmp4_ = shotwell_plugins_common_builder_pane_get_default_widget (G_TYPE_CHECK_INSTANCE_CAST (authentication_pane, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
 #line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp6_ = _tmp5_;
+	_tmp5_ = _tmp4_;
 #line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	spit_publishing_plugin_host_set_dialog_default_widget (_tmp4_, _tmp6_);
+	spit_publishing_plugin_host_set_dialog_default_widget (_tmp3_, _tmp5_);
 #line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_object_unref0 (_tmp6_);
+	_g_object_unref0 (_tmp5_);
 #line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (authentication_pane);
-#line 3136 "PiwigoPublishing.c"
+#line 3634 "PiwigoPublishing.c"
 }
 
 
-static void __lambda7_ (PublishingPiwigoPiwigoPublisher* self) {
+static void
+__lambda7_ (PublishingPiwigoPiwigoPublisher* self)
+{
 	PublishingPiwigoSession* _tmp0_;
 	PublishingPiwigoSession* _tmp1_;
 	gchar* persistent_url = NULL;
@@ -3178,39 +3678,38 @@ static void __lambda7_ (PublishingPiwigoPiwigoPublisher* self) {
 	_tmp7_ = persistent_url;
 #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp7_ != NULL) {
-#line 3180 "PiwigoPublishing.c"
+#line 3680 "PiwigoPublishing.c"
 		const gchar* _tmp8_;
 #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = persistent_username;
 #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp6_ = _tmp8_ != NULL;
-#line 3186 "PiwigoPublishing.c"
+#line 3686 "PiwigoPublishing.c"
 	} else {
 #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp6_ = FALSE;
-#line 3190 "PiwigoPublishing.c"
+#line 3690 "PiwigoPublishing.c"
 	}
 #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp6_) {
-#line 3194 "PiwigoPublishing.c"
+#line 3694 "PiwigoPublishing.c"
 		const gchar* _tmp9_;
 #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp9_ = persistent_password;
 #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp5_ = _tmp9_ != NULL;
-#line 3200 "PiwigoPublishing.c"
+#line 3700 "PiwigoPublishing.c"
 	} else {
 #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp5_ = FALSE;
-#line 3204 "PiwigoPublishing.c"
+#line 3704 "PiwigoPublishing.c"
 	}
 #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp5_) {
-#line 3208 "PiwigoPublishing.c"
+#line 3708 "PiwigoPublishing.c"
 		const gchar* _tmp10_;
 		const gchar* _tmp11_;
 		const gchar* _tmp12_;
-		gboolean _tmp13_;
 #line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp10_ = persistent_url;
 #line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3218,14 +3717,12 @@ static void __lambda7_ (PublishingPiwigoPiwigoPublisher* self) {
 #line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp12_ = persistent_password;
 #line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp13_ = publishing_piwigo_piwigo_publisher_get_remember_password (self);
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		publishing_piwigo_piwigo_publisher_do_network_login (self, _tmp10_, _tmp11_, _tmp12_, _tmp13_);
-#line 3223 "PiwigoPublishing.c"
+		publishing_piwigo_piwigo_publisher_do_network_login (self, _tmp10_, _tmp11_, _tmp12_, publishing_piwigo_piwigo_publisher_get_remember_password (self));
+#line 3720 "PiwigoPublishing.c"
 	} else {
 #line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_piwigo_publisher_do_show_authentication_pane (self, PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_INTRO);
-#line 3227 "PiwigoPublishing.c"
+#line 3724 "PiwigoPublishing.c"
 	}
 #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (persistent_password);
@@ -3233,37 +3730,44 @@ static void __lambda7_ (PublishingPiwigoPiwigoPublisher* self) {
 	_g_free0 (persistent_username);
 #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (persistent_url);
-#line 3235 "PiwigoPublishing.c"
+#line 3732 "PiwigoPublishing.c"
 }
 
 
-static void ___lambda7__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"
 	__lambda7_ ((PublishingPiwigoPiwigoPublisher*) self);
-#line 3242 "PiwigoPublishing.c"
+#line 3742 "PiwigoPublishing.c"
 }
 
 
-static void _vala_SoupURI_free (SoupURI* self) {
+static void
+_vala_SoupURI_free (SoupURI* self)
+{
 #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_boxed_free (soup_uri_get_type (), self);
-#line 3249 "PiwigoPublishing.c"
+#line 3751 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_piwigo_publisher_do_show_ssl_downgrade_pane (PublishingPiwigoPiwigoPublisher* self, PublishingPiwigoSessionLoginTransaction* trans, const gchar* url) {
+static void
+publishing_piwigo_piwigo_publisher_do_show_ssl_downgrade_pane (PublishingPiwigoPiwigoPublisher* self,
+                                                               PublishingPiwigoSessionLoginTransaction* trans,
+                                                               const gchar* url)
+{
 	SoupURI* uri = NULL;
-	const gchar* _tmp0_;
-	SoupURI* _tmp1_;
-	SpitPublishingPluginHost* _tmp2_;
+	SoupURI* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
 	PublishingPiwigoSSLErrorPane* ssl_pane = NULL;
-	PublishingPiwigoSessionLoginTransaction* _tmp3_;
-	const gchar* _tmp4_;
-	PublishingPiwigoSSLErrorPane* _tmp5_;
-	SpitPublishingPluginHost* _tmp6_;
-	SpitPublishingPluginHost* _tmp7_;
-	GtkWidget* _tmp8_;
-	GtkWidget* _tmp9_;
+	const gchar* _tmp2_;
+	PublishingPiwigoSSLErrorPane* _tmp3_;
+	SpitPublishingPluginHost* _tmp4_;
+	SpitPublishingPluginHost* _tmp5_;
+	GtkWidget* _tmp6_;
+	GtkWidget* _tmp7_;
 #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3271,44 +3775,40 @@ static void publishing_piwigo_piwigo_publisher_do_show_ssl_downgrade_pane (Publi
 #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (url != NULL);
 #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = url;
-#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = soup_uri_new (_tmp0_);
+	_tmp0_ = soup_uri_new (url);
 #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	uri = _tmp1_;
+	uri = _tmp0_;
 #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = self->priv->host;
+	_tmp1_ = self->priv->host;
 #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp2_, FALSE);
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp3_ = trans;
+	spit_publishing_plugin_host_set_service_locked (_tmp1_, FALSE);
 #line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp4_ = soup_uri_get_host (uri);
+	_tmp2_ = soup_uri_get_host (uri);
 #line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp5_ = publishing_piwigo_ssl_error_pane_new (_tmp3_, _tmp4_);
+	_tmp3_ = publishing_piwigo_ssl_error_pane_new (trans, _tmp2_);
 #line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	ssl_pane = _tmp5_;
+	ssl_pane = _tmp3_;
 #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	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;
+	_tmp4_ = self->priv->host;
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	spit_publishing_plugin_host_install_dialog_pane (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (ssl_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
+	spit_publishing_plugin_host_install_dialog_pane (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (ssl_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
 #line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp7_ = self->priv->host;
+	_tmp5_ = self->priv->host;
 #line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp8_ = shotwell_plugins_common_builder_pane_get_default_widget (G_TYPE_CHECK_INSTANCE_CAST (ssl_pane, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
+	_tmp6_ = shotwell_plugins_common_builder_pane_get_default_widget (G_TYPE_CHECK_INSTANCE_CAST (ssl_pane, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
 #line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp9_ = _tmp8_;
+	_tmp7_ = _tmp6_;
 #line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	spit_publishing_plugin_host_set_dialog_default_widget (_tmp7_, _tmp9_);
+	spit_publishing_plugin_host_set_dialog_default_widget (_tmp5_, _tmp7_);
 #line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_object_unref0 (_tmp9_);
+	_g_object_unref0 (_tmp7_);
 #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (ssl_pane);
 #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	__vala_SoupURI_free0 (uri);
-#line 3310 "PiwigoPublishing.c"
+#line 3810 "PiwigoPublishing.c"
 }
 
 
@@ -3323,12 +3823,14 @@ static void publishing_piwigo_piwigo_publisher_do_show_ssl_downgrade_pane (Publi
      * @param username the name of the Piwigo user as entered in the dialog
      * @param password the password of the Piwigo as entered in the dialog
      */
-static void publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clicked (PublishingPiwigoPiwigoPublisher* self, const gchar* url, const gchar* username, const gchar* password, gboolean remember_password) {
+static void
+publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clicked (PublishingPiwigoPiwigoPublisher* self,
+                                                                         const gchar* url,
+                                                                         const gchar* username,
+                                                                         const gchar* password,
+                                                                         gboolean remember_password)
+{
 	gboolean _tmp0_;
-	const gchar* _tmp1_;
-	const gchar* _tmp2_;
-	const gchar* _tmp3_;
-	gboolean _tmp4_;
 #line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3345,19 +3847,11 @@ static void publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clic
 	if (!_tmp0_) {
 #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 3347 "PiwigoPublishing.c"
+#line 3849 "PiwigoPublishing.c"
 	}
 #line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = url;
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = username;
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp3_ = password;
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp4_ = remember_password;
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	publishing_piwigo_piwigo_publisher_do_network_login (self, _tmp1_, _tmp2_, _tmp3_, _tmp4_);
-#line 3359 "PiwigoPublishing.c"
+	publishing_piwigo_piwigo_publisher_do_network_login (self, url, username, password, remember_password);
+#line 3853 "PiwigoPublishing.c"
 }
 
 
@@ -3372,34 +3866,42 @@ static void publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clic
      * @param username the name of the Piwigo user used to login
      * @param password the password of the Piwigo user used to login
      */
-static void _publishing_piwigo_piwigo_publisher_on_login_network_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_piwigo_piwigo_publisher_on_login_network_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                              GError* err,
+                                                                                                              gpointer self)
+{
 #line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_login_network_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err);
-#line 3377 "PiwigoPublishing.c"
+#line 3875 "PiwigoPublishing.c"
 }
 
 
-static void _publishing_piwigo_piwigo_publisher_on_login_network_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_piwigo_piwigo_publisher_on_login_network_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                             gpointer self)
+{
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_login_network_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender);
-#line 3384 "PiwigoPublishing.c"
+#line 3885 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwigoPiwigoPublisher* self, const gchar* url, const gchar* username, const gchar* password, gboolean remember_password) {
+static void
+publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwigoPiwigoPublisher* self,
+                                                     const gchar* url,
+                                                     const gchar* username,
+                                                     const gchar* password,
+                                                     gboolean remember_password)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	SpitPublishingPluginHost* _tmp1_;
-	gboolean _tmp2_;
-	gboolean _tmp3_;
 	PublishingPiwigoSessionLoginTransaction* login_trans = NULL;
-	PublishingPiwigoSession* _tmp5_;
-	const gchar* _tmp6_;
-	gchar* _tmp7_;
-	gchar* _tmp8_;
-	const gchar* _tmp9_;
-	const gchar* _tmp10_;
-	PublishingPiwigoSessionLoginTransaction* _tmp11_;
-	PublishingPiwigoSessionLoginTransaction* _tmp12_;
+	PublishingPiwigoSession* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	PublishingPiwigoSessionLoginTransaction* _tmp5_;
+	PublishingPiwigoSessionLoginTransaction* _tmp6_;
 	GError * _inner_error_ = NULL;
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
@@ -3420,50 +3922,36 @@ static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwig
 #line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_install_login_wait_pane (_tmp1_);
 #line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = remember_password;
-#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	publishing_piwigo_piwigo_publisher_set_remember_password (self, _tmp2_);
+	publishing_piwigo_piwigo_publisher_set_remember_password (self, remember_password);
 #line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp3_ = remember_password;
-#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (_tmp3_) {
-#line 3429 "PiwigoPublishing.c"
-		const gchar* _tmp4_;
+	if (remember_password) {
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp4_ = password;
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		publishing_piwigo_piwigo_publisher_set_persistent_password (self, _tmp4_);
-#line 3435 "PiwigoPublishing.c"
+		publishing_piwigo_piwigo_publisher_set_persistent_password (self, password);
+#line 3929 "PiwigoPublishing.c"
 	} else {
 #line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_piwigo_publisher_set_persistent_password (self, NULL);
-#line 3439 "PiwigoPublishing.c"
+#line 3933 "PiwigoPublishing.c"
 	}
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp5_ = self->priv->session;
-#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp6_ = url;
-#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp7_ = publishing_piwigo_piwigo_publisher_normalise_url (_tmp6_);
-#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp8_ = _tmp7_;
+	_tmp2_ = self->priv->session;
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp9_ = username;
+	_tmp3_ = publishing_piwigo_piwigo_publisher_normalise_url (url);
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp10_ = password;
+	_tmp4_ = _tmp3_;
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp11_ = publishing_piwigo_session_login_transaction_new (_tmp5_, _tmp8_, _tmp9_, _tmp10_);
+	_tmp5_ = publishing_piwigo_session_login_transaction_new (_tmp2_, _tmp4_, username, password);
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp12_ = _tmp11_;
+	_tmp6_ = _tmp5_;
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_free0 (_tmp8_);
+	_g_free0 (_tmp4_);
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	login_trans = _tmp12_;
+	login_trans = _tmp6_;
 #line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (login_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_error_publishing_rest_support_transaction_network_error, self, 0);
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (login_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 3465 "PiwigoPublishing.c"
+#line 3953 "PiwigoPublishing.c"
 	{
 #line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (login_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -3471,8 +3959,8 @@ static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwig
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3473 "PiwigoPublishing.c"
-				goto __catch23_spit_publishing_publishing_error;
+#line 3961 "PiwigoPublishing.c"
+				goto __catch28_spit_publishing_publishing_error;
 			}
 #line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (login_trans);
@@ -3482,46 +3970,42 @@ static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwig
 			g_clear_error (&_inner_error_);
 #line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 3484 "PiwigoPublishing.c"
+#line 3972 "PiwigoPublishing.c"
 		}
 	}
-	goto __finally23;
-	__catch23_spit_publishing_publishing_error:
+	goto __finally28;
+	__catch28_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		GError* _tmp13_;
+		GError* _tmp7_;
 #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		err = _inner_error_;
 #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_inner_error_ = NULL;
 #line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp13_ = err;
+		_tmp7_ = err;
 #line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		if (g_error_matches (_tmp13_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SSL_FAILED)) {
-#line 3500 "PiwigoPublishing.c"
-			const gchar* _tmp14_;
+		if (g_error_matches (_tmp7_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SSL_FAILED)) {
 #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_debug ("PiwigoPublishing.vala:367: ERROR: SSL connection problems");
 #line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp14_ = url;
-#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			publishing_piwigo_piwigo_publisher_do_show_ssl_downgrade_pane (self, login_trans, _tmp14_);
-#line 3508 "PiwigoPublishing.c"
+			publishing_piwigo_piwigo_publisher_do_show_ssl_downgrade_pane (self, login_trans, url);
+#line 3992 "PiwigoPublishing.c"
 		} else {
-			GError* _tmp15_;
+			GError* _tmp8_;
 #line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_debug ("PiwigoPublishing.vala:370: ERROR: do_network_login");
 #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp15_ = err;
+			_tmp8_ = err;
 #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp15_);
-#line 3517 "PiwigoPublishing.c"
+			publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp8_);
+#line 4001 "PiwigoPublishing.c"
 		}
 #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_error_free0 (err);
-#line 3521 "PiwigoPublishing.c"
+#line 4005 "PiwigoPublishing.c"
 	}
-	__finally23:
+	__finally28:
 #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"
@@ -3532,113 +4016,100 @@ static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwig
 		g_clear_error (&_inner_error_);
 #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 3534 "PiwigoPublishing.c"
+#line 4018 "PiwigoPublishing.c"
 	}
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (login_trans);
-#line 3538 "PiwigoPublishing.c"
+#line 4022 "PiwigoPublishing.c"
 }
 
 
-gchar* publishing_piwigo_piwigo_publisher_normalise_url (const gchar* url) {
+gchar*
+publishing_piwigo_piwigo_publisher_normalise_url (const gchar* url)
+{
 	gchar* result = NULL;
 	gchar* norm_url = NULL;
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-	const gchar* _tmp2_;
-	gboolean _tmp3_;
-	gboolean _tmp10_ = FALSE;
-	const gchar* _tmp11_;
-	gboolean _tmp12_;
+	gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gboolean _tmp7_ = FALSE;
+	const gchar* _tmp8_;
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (url != NULL, NULL);
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = url;
-#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (url);
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	norm_url = _tmp1_;
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = norm_url;
+	norm_url = _tmp0_;
 #line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp3_ = g_str_has_suffix (_tmp2_, ".php");
+	_tmp1_ = norm_url;
 #line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (!_tmp3_) {
-#line 3566 "PiwigoPublishing.c"
-		const gchar* _tmp4_;
-		gboolean _tmp5_;
-		const gchar* _tmp8_;
-		gchar* _tmp9_;
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp4_ = norm_url;
+	if (!g_str_has_suffix (_tmp1_, ".php")) {
+#line 4045 "PiwigoPublishing.c"
+		const gchar* _tmp2_;
+		const gchar* _tmp5_;
+		gchar* _tmp6_;
 #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp5_ = g_str_has_suffix (_tmp4_, "/");
+		_tmp2_ = norm_url;
 #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		if (!_tmp5_) {
-#line 3577 "PiwigoPublishing.c"
-			const gchar* _tmp6_;
-			gchar* _tmp7_;
+		if (!g_str_has_suffix (_tmp2_, "/")) {
+#line 4053 "PiwigoPublishing.c"
+			const gchar* _tmp3_;
+			gchar* _tmp4_;
 #line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp6_ = norm_url;
+			_tmp3_ = norm_url;
 #line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp7_ = g_strconcat (_tmp6_, "/", NULL);
+			_tmp4_ = g_strconcat (_tmp3_, "/", NULL);
 #line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_free0 (norm_url);
 #line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			norm_url = _tmp7_;
-#line 3588 "PiwigoPublishing.c"
+			norm_url = _tmp4_;
+#line 4064 "PiwigoPublishing.c"
 		}
 #line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp8_ = norm_url;
+		_tmp5_ = norm_url;
 #line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp9_ = g_strconcat (_tmp8_, PUBLISHING_PIWIGO_PIWIGO_WS, NULL);
+		_tmp6_ = g_strconcat (_tmp5_, PUBLISHING_PIWIGO_PIWIGO_WS, NULL);
 #line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (norm_url);
 #line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		norm_url = _tmp9_;
-#line 3598 "PiwigoPublishing.c"
+		norm_url = _tmp6_;
+#line 4074 "PiwigoPublishing.c"
 	}
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp11_ = norm_url;
-#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp12_ = g_str_has_prefix (_tmp11_, "http://");
-#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (!_tmp12_) {
-#line 3606 "PiwigoPublishing.c"
-		const gchar* _tmp13_;
-		gboolean _tmp14_;
+	_tmp8_ = norm_url;
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp13_ = norm_url;
+	if (!g_str_has_prefix (_tmp8_, "http://")) {
+#line 4080 "PiwigoPublishing.c"
+		const gchar* _tmp9_;
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp14_ = g_str_has_prefix (_tmp13_, "https://");
+		_tmp9_ = norm_url;
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp10_ = !_tmp14_;
-#line 3615 "PiwigoPublishing.c"
+		_tmp7_ = !g_str_has_prefix (_tmp9_, "https://");
+#line 4086 "PiwigoPublishing.c"
 	} else {
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp10_ = FALSE;
-#line 3619 "PiwigoPublishing.c"
+		_tmp7_ = FALSE;
+#line 4090 "PiwigoPublishing.c"
 	}
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (_tmp10_) {
-#line 3623 "PiwigoPublishing.c"
-		const gchar* _tmp15_;
-		gchar* _tmp16_;
+	if (_tmp7_) {
+#line 4094 "PiwigoPublishing.c"
+		const gchar* _tmp10_;
+		gchar* _tmp11_;
 #line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp15_ = norm_url;
+		_tmp10_ = norm_url;
 #line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp16_ = g_strconcat ("http://", _tmp15_, NULL);
+		_tmp11_ = g_strconcat ("http://", _tmp10_, NULL);
 #line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (norm_url);
 #line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		norm_url = _tmp16_;
-#line 3634 "PiwigoPublishing.c"
+		norm_url = _tmp11_;
+#line 4105 "PiwigoPublishing.c"
 	}
 #line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = norm_url;
 #line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 3640 "PiwigoPublishing.c"
+#line 4111 "PiwigoPublishing.c"
 }
 
 
@@ -3655,41 +4126,46 @@ gchar* publishing_piwigo_piwigo_publisher_normalise_url (const gchar* url) {
      *
      * @param txn the received REST transaction
      */
-static gchar* _publishing_piwigo_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self) {
+static gchar*
+_publishing_piwigo_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc,
+                                                                                                           gpointer self)
+{
 	gchar* result;
 	result = publishing_piwigo_transaction_validate_xml (doc);
 #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 3662 "PiwigoPublishing.c"
+#line 4136 "PiwigoPublishing.c"
 }
 
 
-static gchar* _publishing_piwigo_transaction_get_error_code_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self) {
+static gchar*
+_publishing_piwigo_transaction_get_error_code_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc,
+                                                                                                             gpointer self)
+{
 	gchar* result;
 	result = publishing_piwigo_transaction_get_error_code (doc);
 #line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 3671 "PiwigoPublishing.c"
+#line 4148 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_piwigo_publisher_on_login_network_complete (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_piwigo_piwigo_publisher_on_login_network_complete (PublishingPiwigoPiwigoPublisher* self,
+                                                              PublishingRESTSupportTransaction* txn)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
 	gchar* endpoint_url = NULL;
-	PublishingRESTSupportTransaction* _tmp19_;
-	gchar* _tmp20_;
-	const gchar* _tmp21_;
+	gchar* _tmp14_;
+	const gchar* _tmp15_;
 	gchar* pwg_id = NULL;
-	PublishingRESTSupportTransaction* _tmp22_;
-	gchar* _tmp23_;
-	const gchar* _tmp24_;
-	PublishingPiwigoSession* _tmp25_;
-	const gchar* _tmp26_;
-	const gchar* _tmp27_;
-	const gchar* _tmp28_;
+	gchar* _tmp16_;
+	const gchar* _tmp17_;
+	PublishingPiwigoSession* _tmp18_;
+	const gchar* _tmp19_;
+	const gchar* _tmp20_;
+	const gchar* _tmp21_;
 	GError * _inner_error_ = NULL;
 #line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
@@ -3698,44 +4174,37 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
 #line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_debug ("PiwigoPublishing.vala:407: EVENT: on_login_network_complete");
 #line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = txn;
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
 #line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_complete_publishing_rest_support_transaction_completed, self);
-#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = txn;
+	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_complete_publishing_rest_support_transaction_completed, self);
 #line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_error_publishing_rest_support_transaction_network_error, self);
-#line 3711 "PiwigoPublishing.c"
+	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_error_publishing_rest_support_transaction_network_error, self);
+#line 4183 "PiwigoPublishing.c"
 	{
-		PublishingRESTSupportTransaction* _tmp4_;
-		gchar* _tmp5_;
-		gchar* _tmp6_;
-		PublishingRESTSupportXmlDocument* _tmp7_;
-		PublishingRESTSupportXmlDocument* _tmp8_;
+		gchar* _tmp2_;
+		gchar* _tmp3_;
+		PublishingRESTSupportXmlDocument* _tmp4_;
+		PublishingRESTSupportXmlDocument* _tmp5_;
 #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp4_ = txn;
+		_tmp2_ = publishing_rest_support_transaction_get_response (txn);
 #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
+		_tmp3_ = _tmp2_;
 #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp6_ = _tmp5_;
+		_tmp4_ = publishing_rest_support_xml_document_parse_string (_tmp3_, _publishing_piwigo_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
 #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp7_ = publishing_rest_support_xml_document_parse_string (_tmp6_, _publishing_piwigo_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp8_ = _tmp7_;
+		_tmp5_ = _tmp4_;
 #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_publishing_rest_support_xml_document_unref0 (_tmp8_);
+		_publishing_rest_support_xml_document_unref0 (_tmp5_);
 #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_free0 (_tmp6_);
+		_g_free0 (_tmp3_);
 #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3736 "PiwigoPublishing.c"
-				goto __catch24_spit_publishing_publishing_error;
+#line 4205 "PiwigoPublishing.c"
+				goto __catch29_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);
@@ -3743,44 +4212,41 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
 			g_clear_error (&_inner_error_);
 #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 3745 "PiwigoPublishing.c"
+#line 4214 "PiwigoPublishing.c"
 		}
 	}
-	goto __finally24;
-	__catch24_spit_publishing_publishing_error:
+	goto __finally29;
+	__catch29_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 #line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		err = _inner_error_;
 #line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_inner_error_ = NULL;
-#line 3756 "PiwigoPublishing.c"
+#line 4225 "PiwigoPublishing.c"
 		{
-			PublishingRESTSupportTransaction* _tmp9_;
-			gchar* _tmp10_;
-			gchar* _tmp11_;
-			PublishingRESTSupportXmlDocument* _tmp12_;
-			PublishingRESTSupportXmlDocument* _tmp13_;
-#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp9_ = txn;
+			gchar* _tmp6_;
+			gchar* _tmp7_;
+			PublishingRESTSupportXmlDocument* _tmp8_;
+			PublishingRESTSupportXmlDocument* _tmp9_;
 #line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp10_ = publishing_rest_support_transaction_get_response (_tmp9_);
+			_tmp6_ = publishing_rest_support_transaction_get_response (txn);
 #line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp11_ = _tmp10_;
+			_tmp7_ = _tmp6_;
 #line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp12_ = publishing_rest_support_xml_document_parse_string (_tmp11_, _publishing_piwigo_transaction_get_error_code_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
+			_tmp8_ = publishing_rest_support_xml_document_parse_string (_tmp7_, _publishing_piwigo_transaction_get_error_code_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
 #line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp13_ = _tmp12_;
+			_tmp9_ = _tmp8_;
 #line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_publishing_rest_support_xml_document_unref0 (_tmp13_);
+			_publishing_rest_support_xml_document_unref0 (_tmp9_);
 #line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_g_free0 (_tmp11_);
+			_g_free0 (_tmp7_);
 #line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3781 "PiwigoPublishing.c"
-					goto __catch25_spit_publishing_publishing_error;
+#line 4247 "PiwigoPublishing.c"
+					goto __catch30_spit_publishing_publishing_error;
 				}
 #line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_error_free0 (err);
@@ -3790,54 +4256,51 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
 				g_clear_error (&_inner_error_);
 #line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				return;
-#line 3792 "PiwigoPublishing.c"
+#line 4258 "PiwigoPublishing.c"
 			}
 		}
-		goto __finally25;
-		__catch25_spit_publishing_publishing_error:
+		goto __finally30;
+		__catch30_spit_publishing_publishing_error:
 		{
 			GError* code = NULL;
 			gint code_int = 0;
-			GError* _tmp14_;
-			const gchar* _tmp15_;
-			gint _tmp16_;
-			gint _tmp17_;
+			GError* _tmp10_;
+			const gchar* _tmp11_;
+			gint _tmp12_;
 #line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			code = _inner_error_;
 #line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_inner_error_ = NULL;
 #line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp14_ = code;
+			_tmp10_ = code;
 #line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp15_ = _tmp14_->message;
+			_tmp11_ = _tmp10_->message;
 #line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp16_ = atoi (_tmp15_);
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			code_int = _tmp16_;
+			code_int = atoi (_tmp11_);
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp17_ = code_int;
+			_tmp12_ = code_int;
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			if (_tmp17_ == 999) {
+			if (_tmp12_ == 999) {
 #line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				g_debug ("PiwigoPublishing.vala:422: ERROR: on_login_network_complete, code 999");
 #line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				publishing_piwigo_piwigo_publisher_do_show_authentication_pane (self, PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER);
-#line 3824 "PiwigoPublishing.c"
+#line 4287 "PiwigoPublishing.c"
 			} else {
-				GError* _tmp18_;
+				GError* _tmp13_;
 #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				g_debug ("PiwigoPublishing.vala:425: ERROR: on_login_network_complete");
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp18_ = err;
+				_tmp13_ = err;
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp18_);
-#line 3833 "PiwigoPublishing.c"
+				publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp13_);
+#line 4296 "PiwigoPublishing.c"
 			}
 #line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_error_free0 (code);
-#line 3837 "PiwigoPublishing.c"
+#line 4300 "PiwigoPublishing.c"
 		}
-		__finally25:
+		__finally30:
 #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"
@@ -3850,15 +4313,15 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
 			g_clear_error (&_inner_error_);
 #line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 3852 "PiwigoPublishing.c"
+#line 4315 "PiwigoPublishing.c"
 		}
 #line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_error_free0 (err);
 #line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 3858 "PiwigoPublishing.c"
+#line 4321 "PiwigoPublishing.c"
 	}
-	__finally24:
+	__finally29:
 #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"
@@ -3867,45 +4330,41 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
 		g_clear_error (&_inner_error_);
 #line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 3869 "PiwigoPublishing.c"
+#line 4332 "PiwigoPublishing.c"
 	}
 #line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp19_ = txn;
-#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp20_ = publishing_rest_support_transaction_get_endpoint_url (_tmp19_);
+	_tmp14_ = publishing_rest_support_transaction_get_endpoint_url (txn);
 #line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	endpoint_url = _tmp20_;
+	endpoint_url = _tmp14_;
 #line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp21_ = endpoint_url;
+	_tmp15_ = endpoint_url;
 #line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:433: Setting endpoint URL to %s", _tmp21_);
+	g_debug ("PiwigoPublishing.vala:433: Setting endpoint URL to %s", _tmp15_);
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp22_ = txn;
+	_tmp16_ = publishing_piwigo_piwigo_publisher_get_pwg_id_from_transaction (self, txn);
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp23_ = publishing_piwigo_piwigo_publisher_get_pwg_id_from_transaction (self, _tmp22_);
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	pwg_id = _tmp23_;
+	pwg_id = _tmp16_;
 #line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp24_ = pwg_id;
+	_tmp17_ = pwg_id;
 #line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:435: Setting session pwg_id to %s", _tmp24_);
+	g_debug ("PiwigoPublishing.vala:435: Setting session pwg_id to %s", _tmp17_);
 #line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp25_ = self->priv->session;
+	_tmp18_ = self->priv->session;
 #line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp26_ = pwg_id;
+	_tmp19_ = pwg_id;
 #line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	publishing_piwigo_session_set_pwg_id (_tmp25_, _tmp26_);
+	publishing_piwigo_session_set_pwg_id (_tmp18_, _tmp19_);
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp27_ = endpoint_url;
+	_tmp20_ = endpoint_url;
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp28_ = pwg_id;
+	_tmp21_ = pwg_id;
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	publishing_piwigo_piwigo_publisher_do_fetch_session_status (self, _tmp27_, _tmp28_);
+	publishing_piwigo_piwigo_publisher_do_fetch_session_status (self, _tmp20_, _tmp21_);
 #line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (pwg_id);
 #line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (endpoint_url);
-#line 3907 "PiwigoPublishing.c"
+#line 4366 "PiwigoPublishing.c"
 }
 
 
@@ -3920,13 +4379,14 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
      * @param bad_txn the received REST transaction
      * @param err the received error
      */
-static void publishing_piwigo_piwigo_publisher_on_login_network_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_piwigo_piwigo_publisher_on_login_network_error (PublishingPiwigoPiwigoPublisher* self,
+                                                           PublishingRESTSupportTransaction* bad_txn,
+                                                           GError* err)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	PublishingPiwigoSession* _tmp4_;
-	gboolean _tmp5_;
+	PublishingPiwigoSession* _tmp2_;
 #line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3934,30 +4394,24 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_error (Publishin
 #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_debug ("PiwigoPublishing.vala:456: EVENT: on_login_network_error");
 #line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = bad_txn;
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
 #line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_complete_publishing_rest_support_transaction_completed, self);
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = bad_txn;
+	g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_complete_publishing_rest_support_transaction_completed, self);
 #line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_error_publishing_rest_support_transaction_network_error, self);
+	g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_error_publishing_rest_support_transaction_network_error, self);
 #line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp4_ = self->priv->session;
-#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp5_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
+	_tmp2_ = self->priv->session;
 #line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (_tmp5_) {
+	if (publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
 #line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 3955 "PiwigoPublishing.c"
+#line 4409 "PiwigoPublishing.c"
 	}
 #line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_do_show_authentication_pane (self, PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_URL);
-#line 3959 "PiwigoPublishing.c"
+#line 4413 "PiwigoPublishing.c"
 }
 
 
@@ -3971,25 +4425,35 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_error (Publishin
      * persisted. In this case, it will log the user in and confirm the
      * identity.
      */
-static void _publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                                   GError* err,
+                                                                                                                   gpointer self)
+{
 #line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_session_get_status_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err);
-#line 3976 "PiwigoPublishing.c"
+#line 4434 "PiwigoPublishing.c"
 }
 
 
-static void _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                                  gpointer self)
+{
 #line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_session_get_status_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender);
-#line 3983 "PiwigoPublishing.c"
+#line 4444 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (PublishingPiwigoPiwigoPublisher* self, const gchar* url, const gchar* pwg_id) {
+static void
+publishing_piwigo_piwigo_publisher_do_fetch_session_status (PublishingPiwigoPiwigoPublisher* self,
+                                                            const gchar* url,
+                                                            const gchar* pwg_id)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	SpitPublishingPluginHost* _tmp1_;
 	PublishingPiwigoSession* _tmp2_;
-	gboolean _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
@@ -4010,48 +4474,40 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = self->priv->session;
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp3_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (!_tmp3_) {
-#line 4015 "PiwigoPublishing.c"
+	if (!publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
+#line 4477 "PiwigoPublishing.c"
 		PublishingPiwigoSessionGetStatusTransaction* status_txn = NULL;
-		PublishingPiwigoSession* _tmp4_;
-		const gchar* _tmp5_;
-		const gchar* _tmp6_;
-		PublishingPiwigoSessionGetStatusTransaction* _tmp7_;
-		PublishingPiwigoSessionGetStatusTransaction* _tmp8_;
-		PublishingPiwigoSessionGetStatusTransaction* _tmp9_;
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp4_ = self->priv->session;
+		PublishingPiwigoSession* _tmp3_;
+		PublishingPiwigoSessionGetStatusTransaction* _tmp4_;
+		PublishingPiwigoSessionGetStatusTransaction* _tmp5_;
+		PublishingPiwigoSessionGetStatusTransaction* _tmp6_;
 #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp5_ = url;
+		_tmp3_ = self->priv->session;
 #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp6_ = pwg_id;
+		_tmp4_ = publishing_piwigo_session_get_status_transaction_new_unauthenticated (_tmp3_, url, pwg_id);
 #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp7_ = publishing_piwigo_session_get_status_transaction_new_unauthenticated (_tmp4_, _tmp5_, _tmp6_);
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		status_txn = _tmp7_;
+		status_txn = _tmp4_;
 #line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp8_ = status_txn;
+		_tmp5_ = status_txn;
 #line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error, self, 0);
+		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error, self, 0);
 #line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp9_ = status_txn;
+		_tmp6_ = status_txn;
 #line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 4041 "PiwigoPublishing.c"
+		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed, self, 0);
+#line 4497 "PiwigoPublishing.c"
 		{
-			PublishingPiwigoSessionGetStatusTransaction* _tmp10_;
+			PublishingPiwigoSessionGetStatusTransaction* _tmp7_;
 #line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp10_ = status_txn;
+			_tmp7_ = status_txn;
 #line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
+			publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
 #line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4052 "PiwigoPublishing.c"
-					goto __catch26_spit_publishing_publishing_error;
+#line 4508 "PiwigoPublishing.c"
+					goto __catch31_spit_publishing_publishing_error;
 				}
 #line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_publishing_rest_support_transaction_unref0 (status_txn);
@@ -4061,14 +4517,14 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 				g_clear_error (&_inner_error_);
 #line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				return;
-#line 4063 "PiwigoPublishing.c"
+#line 4519 "PiwigoPublishing.c"
 			}
 		}
-		goto __finally26;
-		__catch26_spit_publishing_publishing_error:
+		goto __finally31;
+		__catch31_spit_publishing_publishing_error:
 		{
 			GError* err = NULL;
-			GError* _tmp11_;
+			GError* _tmp8_;
 #line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			err = _inner_error_;
 #line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4077,14 +4533,14 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 			g_debug ("PiwigoPublishing.vala:489: ERROR: do_fetch_session_status, not authent" \
 "icated");
 #line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp11_ = err;
+			_tmp8_ = err;
 #line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp11_);
+			publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp8_);
 #line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_error_free0 (err);
-#line 4083 "PiwigoPublishing.c"
+#line 4539 "PiwigoPublishing.c"
 		}
-		__finally26:
+		__finally31:
 #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"
@@ -4095,44 +4551,44 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 			g_clear_error (&_inner_error_);
 #line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 4096 "PiwigoPublishing.c"
+#line 4552 "PiwigoPublishing.c"
 		}
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_publishing_rest_support_transaction_unref0 (status_txn);
-#line 4100 "PiwigoPublishing.c"
+#line 4556 "PiwigoPublishing.c"
 	} else {
 		PublishingPiwigoSessionGetStatusTransaction* status_txn = NULL;
-		PublishingPiwigoSession* _tmp12_;
-		PublishingPiwigoSessionGetStatusTransaction* _tmp13_;
-		PublishingPiwigoSessionGetStatusTransaction* _tmp14_;
-		PublishingPiwigoSessionGetStatusTransaction* _tmp15_;
+		PublishingPiwigoSession* _tmp9_;
+		PublishingPiwigoSessionGetStatusTransaction* _tmp10_;
+		PublishingPiwigoSessionGetStatusTransaction* _tmp11_;
+		PublishingPiwigoSessionGetStatusTransaction* _tmp12_;
 #line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp12_ = self->priv->session;
+		_tmp9_ = self->priv->session;
 #line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp13_ = publishing_piwigo_session_get_status_transaction_new (_tmp12_);
+		_tmp10_ = publishing_piwigo_session_get_status_transaction_new (_tmp9_);
 #line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		status_txn = _tmp13_;
+		status_txn = _tmp10_;
 #line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp14_ = status_txn;
+		_tmp11_ = status_txn;
 #line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error, self, 0);
+		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error, self, 0);
 #line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp15_ = status_txn;
+		_tmp12_ = status_txn;
 #line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 4121 "PiwigoPublishing.c"
+		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed, self, 0);
+#line 4577 "PiwigoPublishing.c"
 		{
-			PublishingPiwigoSessionGetStatusTransaction* _tmp16_;
+			PublishingPiwigoSessionGetStatusTransaction* _tmp13_;
 #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp16_ = status_txn;
+			_tmp13_ = status_txn;
 #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
+			publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
 #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4132 "PiwigoPublishing.c"
-					goto __catch27_spit_publishing_publishing_error;
+#line 4588 "PiwigoPublishing.c"
+					goto __catch32_spit_publishing_publishing_error;
 				}
 #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_publishing_rest_support_transaction_unref0 (status_txn);
@@ -4142,14 +4598,14 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 				g_clear_error (&_inner_error_);
 #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				return;
-#line 4143 "PiwigoPublishing.c"
+#line 4599 "PiwigoPublishing.c"
 			}
 		}
-		goto __finally27;
-		__catch27_spit_publishing_publishing_error:
+		goto __finally32;
+		__catch32_spit_publishing_publishing_error:
 		{
 			GError* err = NULL;
-			GError* _tmp17_;
+			GError* _tmp14_;
 #line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			err = _inner_error_;
 #line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4158,14 +4614,14 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 			g_debug ("PiwigoPublishing.vala:500: ERROR: do_fetch_session_status, authenticat" \
 "ed");
 #line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp17_ = err;
+			_tmp14_ = err;
 #line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp17_);
+			publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp14_);
 #line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_error_free0 (err);
-#line 4163 "PiwigoPublishing.c"
+#line 4619 "PiwigoPublishing.c"
 		}
-		__finally27:
+		__finally32:
 #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"
@@ -4176,11 +4632,11 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 			g_clear_error (&_inner_error_);
 #line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 4176 "PiwigoPublishing.c"
+#line 4632 "PiwigoPublishing.c"
 		}
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_publishing_rest_support_transaction_unref0 (status_txn);
-#line 4180 "PiwigoPublishing.c"
+#line 4636 "PiwigoPublishing.c"
 	}
 }
 
@@ -4192,13 +4648,13 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
      * used. If the session is not fully authenticated yet, this event finalises
      * session authentication. It then triggers the fetch categories action.
      */
-static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_piwigo_piwigo_publisher_on_session_get_status_complete (PublishingPiwigoPiwigoPublisher* self,
+                                                                   PublishingRESTSupportTransaction* txn)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	PublishingPiwigoSession* _tmp4_;
-	gboolean _tmp5_;
+	PublishingPiwigoSession* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
@@ -4207,79 +4663,67 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 #line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_debug ("PiwigoPublishing.vala:514: EVENT: on_session_get_status_complete");
 #line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = txn;
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
 #line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed, self);
-#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = txn;
+	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed, self);
 #line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error, self);
+	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error, self);
 #line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp4_ = self->priv->session;
-#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp5_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
+	_tmp2_ = self->priv->session;
 #line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (!_tmp5_) {
-#line 4224 "PiwigoPublishing.c"
+	if (!publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
+#line 4674 "PiwigoPublishing.c"
 		gchar* endpoint_url = NULL;
-		PublishingRESTSupportTransaction* _tmp6_;
-		gchar* _tmp7_;
+		gchar* _tmp3_;
 		gchar* pwg_id = NULL;
-		PublishingPiwigoSession* _tmp8_;
-		gchar* _tmp9_;
-		const gchar* _tmp10_;
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp6_ = txn;
+		PublishingPiwigoSession* _tmp4_;
+		gchar* _tmp5_;
+		const gchar* _tmp6_;
 #line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp7_ = publishing_rest_support_transaction_get_endpoint_url (_tmp6_);
+		_tmp3_ = publishing_rest_support_transaction_get_endpoint_url (txn);
 #line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		endpoint_url = _tmp7_;
+		endpoint_url = _tmp3_;
 #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp8_ = self->priv->session;
+		_tmp4_ = self->priv->session;
 #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp9_ = publishing_piwigo_session_get_pwg_id (_tmp8_);
+		_tmp5_ = publishing_piwigo_session_get_pwg_id (_tmp4_);
 #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		pwg_id = _tmp9_;
+		pwg_id = _tmp5_;
 #line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp10_ = pwg_id;
+		_tmp6_ = pwg_id;
 #line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_debug ("PiwigoPublishing.vala:521: Fetching session status for pwg_id %s", _tmp10_);
-#line 4248 "PiwigoPublishing.c"
+		g_debug ("PiwigoPublishing.vala:521: Fetching session status for pwg_id %s", _tmp6_);
+#line 4695 "PiwigoPublishing.c"
 		{
 			PublishingRESTSupportXmlDocument* doc = NULL;
-			PublishingRESTSupportTransaction* _tmp11_;
-			gchar* _tmp12_;
-			gchar* _tmp13_;
-			PublishingRESTSupportXmlDocument* _tmp14_;
-			PublishingRESTSupportXmlDocument* _tmp15_;
+			gchar* _tmp7_;
+			gchar* _tmp8_;
+			PublishingRESTSupportXmlDocument* _tmp9_;
+			PublishingRESTSupportXmlDocument* _tmp10_;
 			xmlNode* root = NULL;
-			PublishingRESTSupportXmlDocument* _tmp16_;
-			xmlNode* _tmp17_;
+			PublishingRESTSupportXmlDocument* _tmp11_;
+			xmlNode* _tmp12_;
 			xmlNode* username_node = NULL;
 #line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp11_ = txn;
+			_tmp7_ = publishing_rest_support_transaction_get_response (txn);
 #line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp12_ = publishing_rest_support_transaction_get_response (_tmp11_);
+			_tmp8_ = _tmp7_;
 #line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp13_ = _tmp12_;
+			_tmp9_ = publishing_rest_support_xml_document_parse_string (_tmp8_, _publishing_piwigo_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
 #line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp14_ = publishing_rest_support_xml_document_parse_string (_tmp13_, _publishing_piwigo_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
-#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp15_ = _tmp14_;
+			_tmp10_ = _tmp9_;
 #line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_g_free0 (_tmp13_);
+			_g_free0 (_tmp8_);
 #line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			doc = _tmp15_;
+			doc = _tmp10_;
 #line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4278 "PiwigoPublishing.c"
-					goto __catch28_spit_publishing_publishing_error;
+#line 4722 "PiwigoPublishing.c"
+					goto __catch33_spit_publishing_publishing_error;
 				}
 #line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_free0 (pwg_id);
@@ -4291,48 +4735,48 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 				g_clear_error (&_inner_error_);
 #line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				return;
-#line 4291 "PiwigoPublishing.c"
+#line 4735 "PiwigoPublishing.c"
 			}
 #line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp16_ = doc;
+			_tmp11_ = doc;
 #line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp17_ = publishing_rest_support_xml_document_get_root_node (_tmp16_);
+			_tmp12_ = publishing_rest_support_xml_document_get_root_node (_tmp11_);
 #line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			root = _tmp17_;
-#line 4299 "PiwigoPublishing.c"
+			root = _tmp12_;
+#line 4743 "PiwigoPublishing.c"
 			{
-				xmlNode* _tmp18_ = NULL;
-				PublishingRESTSupportXmlDocument* _tmp19_;
-				xmlNode* _tmp20_;
-				xmlNode* _tmp21_;
+				xmlNode* _tmp13_ = NULL;
+				PublishingRESTSupportXmlDocument* _tmp14_;
+				xmlNode* _tmp15_;
+				xmlNode* _tmp16_;
 				gchar* username = NULL;
-				xmlNode* _tmp22_;
-				gchar* _tmp23_;
-				const gchar* _tmp24_;
-				PublishingPiwigoSession* _tmp25_;
-				const gchar* _tmp26_;
-				const gchar* _tmp27_;
-				const gchar* _tmp28_;
-				PublishingPiwigoSession* _tmp29_;
-				gchar* _tmp30_;
-				gchar* _tmp31_;
-				PublishingPiwigoSession* _tmp32_;
-				gchar* _tmp33_;
-				gchar* _tmp34_;
+				xmlNode* _tmp17_;
+				gchar* _tmp18_;
+				const gchar* _tmp19_;
+				PublishingPiwigoSession* _tmp20_;
+				const gchar* _tmp21_;
+				const gchar* _tmp22_;
+				const gchar* _tmp23_;
+				PublishingPiwigoSession* _tmp24_;
+				gchar* _tmp25_;
+				gchar* _tmp26_;
+				PublishingPiwigoSession* _tmp27_;
+				gchar* _tmp28_;
+				gchar* _tmp29_;
 #line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp19_ = doc;
+				_tmp14_ = doc;
 #line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp20_ = root;
+				_tmp15_ = root;
 #line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp21_ = publishing_rest_support_xml_document_get_named_child (_tmp19_, _tmp20_, "username", &_inner_error_);
+				_tmp16_ = publishing_rest_support_xml_document_get_named_child (_tmp14_, _tmp15_, "username", &_inner_error_);
 #line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp18_ = _tmp21_;
+				_tmp13_ = _tmp16_;
 #line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4331 "PiwigoPublishing.c"
-						goto __catch29_spit_publishing_publishing_error;
+#line 4775 "PiwigoPublishing.c"
+						goto __catch34_spit_publishing_publishing_error;
 					}
 #line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_publishing_rest_support_xml_document_unref0 (doc);
@@ -4346,61 +4790,61 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 					g_clear_error (&_inner_error_);
 #line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					return;
-#line 4346 "PiwigoPublishing.c"
+#line 4790 "PiwigoPublishing.c"
 				}
 #line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				username_node = _tmp18_;
+				username_node = _tmp13_;
 #line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp22_ = username_node;
+				_tmp17_ = username_node;
 #line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp23_ = (gchar*) xmlNodeGetContent (_tmp22_);
+				_tmp18_ = (gchar*) xmlNodeGetContent (_tmp17_);
 #line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				username = _tmp23_;
+				username = _tmp18_;
 #line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp24_ = username;
+				_tmp19_ = username;
 #line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				g_debug ("PiwigoPublishing.vala:532: Returned username is %s", _tmp24_);
+				g_debug ("PiwigoPublishing.vala:532: Returned username is %s", _tmp19_);
 #line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp25_ = self->priv->session;
+				_tmp20_ = self->priv->session;
 #line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp26_ = endpoint_url;
+				_tmp21_ = endpoint_url;
 #line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp27_ = username;
+				_tmp22_ = username;
 #line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp28_ = pwg_id;
+				_tmp23_ = pwg_id;
 #line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				publishing_piwigo_session_authenticate (_tmp25_, _tmp26_, _tmp27_, _tmp28_);
+				publishing_piwigo_session_authenticate (_tmp20_, _tmp21_, _tmp22_, _tmp23_);
 #line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp29_ = self->priv->session;
+				_tmp24_ = self->priv->session;
 #line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp30_ = publishing_piwigo_session_get_pwg_url (_tmp29_);
+				_tmp25_ = publishing_piwigo_session_get_pwg_url (_tmp24_);
 #line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp31_ = _tmp30_;
+				_tmp26_ = _tmp25_;
 #line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				publishing_piwigo_piwigo_publisher_set_persistent_url (self, _tmp31_);
+				publishing_piwigo_piwigo_publisher_set_persistent_url (self, _tmp26_);
 #line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_g_free0 (_tmp31_);
+				_g_free0 (_tmp26_);
 #line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp32_ = self->priv->session;
+				_tmp27_ = self->priv->session;
 #line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp33_ = publishing_piwigo_session_get_username (_tmp32_);
+				_tmp28_ = publishing_piwigo_session_get_username (_tmp27_);
 #line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp34_ = _tmp33_;
+				_tmp29_ = _tmp28_;
 #line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				publishing_piwigo_piwigo_publisher_set_persistent_username (self, _tmp34_);
+				publishing_piwigo_piwigo_publisher_set_persistent_username (self, _tmp29_);
 #line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_g_free0 (_tmp34_);
+				_g_free0 (_tmp29_);
 #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				publishing_piwigo_piwigo_publisher_do_fetch_categories (self);
 #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_free0 (username);
-#line 4394 "PiwigoPublishing.c"
+#line 4838 "PiwigoPublishing.c"
 			}
-			goto __finally29;
-			__catch29_spit_publishing_publishing_error:
+			goto __finally34;
+			__catch34_spit_publishing_publishing_error:
 			{
 				GError* err2 = NULL;
-				GError* _tmp35_;
+				GError* _tmp30_;
 #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				err2 = _inner_error_;
 #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4409,9 +4853,9 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 				g_debug ("PiwigoPublishing.vala:538: ERROR: on_session_get_status_complete, inne" \
 "r");
 #line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp35_ = err2;
+				_tmp30_ = err2;
 #line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp35_);
+				publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp30_);
 #line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_error_free0 (err2);
 #line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4422,17 +4866,17 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 				_g_free0 (endpoint_url);
 #line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				return;
-#line 4421 "PiwigoPublishing.c"
+#line 4865 "PiwigoPublishing.c"
 			}
-			__finally29:
+			__finally34:
 #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"
 				_publishing_rest_support_xml_document_unref0 (doc);
 #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4430 "PiwigoPublishing.c"
-					goto __catch28_spit_publishing_publishing_error;
+#line 4874 "PiwigoPublishing.c"
+					goto __catch33_spit_publishing_publishing_error;
 				}
 #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_publishing_rest_support_xml_document_unref0 (doc);
@@ -4446,17 +4890,17 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 				g_clear_error (&_inner_error_);
 #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				return;
-#line 4445 "PiwigoPublishing.c"
+#line 4889 "PiwigoPublishing.c"
 			}
 #line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (doc);
-#line 4449 "PiwigoPublishing.c"
+#line 4893 "PiwigoPublishing.c"
 		}
-		goto __finally28;
-		__catch28_spit_publishing_publishing_error:
+		goto __finally33;
+		__catch33_spit_publishing_publishing_error:
 		{
 			GError* err = NULL;
-			GError* _tmp36_;
+			GError* _tmp31_;
 #line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			err = _inner_error_;
 #line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4465,9 +4909,9 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 			g_debug ("PiwigoPublishing.vala:543: ERROR: on_session_get_status_complete, oute" \
 "r");
 #line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp36_ = err;
+			_tmp31_ = err;
 #line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp36_);
+			publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp31_);
 #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_error_free0 (err);
 #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4476,9 +4920,9 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 			_g_free0 (endpoint_url);
 #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 4474 "PiwigoPublishing.c"
+#line 4918 "PiwigoPublishing.c"
 		}
-		__finally28:
+		__finally33:
 #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"
@@ -4491,17 +4935,17 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 			g_clear_error (&_inner_error_);
 #line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 4489 "PiwigoPublishing.c"
+#line 4933 "PiwigoPublishing.c"
 		}
 #line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (pwg_id);
 #line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (endpoint_url);
-#line 4495 "PiwigoPublishing.c"
+#line 4939 "PiwigoPublishing.c"
 	} else {
 #line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_piwigo_publisher_do_fetch_categories (self);
-#line 4499 "PiwigoPublishing.c"
+#line 4943 "PiwigoPublishing.c"
 	}
 }
 
@@ -4509,13 +4953,13 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 /**
      * Event triggered when the get session status fails due to a network error.
      */
-static void publishing_piwigo_piwigo_publisher_on_session_get_status_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_piwigo_piwigo_publisher_on_session_get_status_error (PublishingPiwigoPiwigoPublisher* self,
+                                                                PublishingRESTSupportTransaction* bad_txn,
+                                                                GError* err)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	PublishingRESTSupportTransaction* _tmp4_;
-	GError* _tmp5_;
 #line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4523,24 +4967,16 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_error (Publ
 #line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_debug ("PiwigoPublishing.vala:562: EVENT: on_session_get_status_error");
 #line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = bad_txn;
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
 #line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed, self);
-#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = bad_txn;
+	g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed, self);
 #line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error, self);
+	g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error, self);
 #line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp4_ = bad_txn;
-#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp5_ = err;
-#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	publishing_piwigo_piwigo_publisher_on_network_error (self, _tmp4_, _tmp5_);
-#line 4538 "PiwigoPublishing.c"
+	publishing_piwigo_piwigo_publisher_on_network_error (self, bad_txn, err);
+#line 4974 "PiwigoPublishing.c"
 }
 
 
@@ -4550,21 +4986,30 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_error (Publ
      * This action fetches all categories from the Piwigo service in order
      * to populate the publishing pane presented to the user.
      */
-static void _publishing_piwigo_piwigo_publisher_on_category_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_piwigo_piwigo_publisher_on_category_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                               GError* err,
+                                                                                                               gpointer self)
+{
 #line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_category_fetch_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err);
-#line 4551 "PiwigoPublishing.c"
+#line 4991 "PiwigoPublishing.c"
 }
 
 
-static void _publishing_piwigo_piwigo_publisher_on_category_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_piwigo_piwigo_publisher_on_category_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                              gpointer self)
+{
 #line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_category_fetch_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender);
-#line 4558 "PiwigoPublishing.c"
+#line 5001 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPiwigoPiwigoPublisher* self) {
+static void
+publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPiwigoPiwigoPublisher* self)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	SpitPublishingPluginHost* _tmp1_;
 	PublishingPiwigoCategoriesGetListTransaction* cat_trans = NULL;
@@ -4593,7 +5038,7 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (cat_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_error_publishing_rest_support_transaction_network_error, self, 0);
 #line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (cat_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 4591 "PiwigoPublishing.c"
+#line 5036 "PiwigoPublishing.c"
 	{
 #line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (cat_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -4601,8 +5046,8 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4599 "PiwigoPublishing.c"
-				goto __catch30_spit_publishing_publishing_error;
+#line 5044 "PiwigoPublishing.c"
+				goto __catch35_spit_publishing_publishing_error;
 			}
 #line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (cat_trans);
@@ -4612,11 +5057,11 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi
 			g_clear_error (&_inner_error_);
 #line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 4610 "PiwigoPublishing.c"
+#line 5055 "PiwigoPublishing.c"
 		}
 	}
-	goto __finally30;
-	__catch30_spit_publishing_publishing_error:
+	goto __finally35;
+	__catch35_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_;
@@ -4632,9 +5077,9 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi
 		publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp4_);
 #line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_error_free0 (err);
-#line 4630 "PiwigoPublishing.c"
+#line 5075 "PiwigoPublishing.c"
 	}
-	__finally30:
+	__finally35:
 #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"
@@ -4645,11 +5090,11 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi
 		g_clear_error (&_inner_error_);
 #line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 4643 "PiwigoPublishing.c"
+#line 5088 "PiwigoPublishing.c"
 	}
 #line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (cat_trans);
-#line 4647 "PiwigoPublishing.c"
+#line 5092 "PiwigoPublishing.c"
 }
 
 
@@ -4660,33 +5105,38 @@ 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_add35 (PublishingPiwigoCategory** * array, int* length, int* size, PublishingPiwigoCategory* value) {
+static void
+_vala_array_add38 (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"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoCategory*, *array, (*size) + 1);
-#line 4665 "PiwigoPublishing.c"
+#line 5115 "PiwigoPublishing.c"
 	}
 #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 4671 "PiwigoPublishing.c"
+#line 5121 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_piwigo_piwigo_publisher_on_category_fetch_complete (PublishingPiwigoPiwigoPublisher* self,
+                                                               PublishingRESTSupportTransaction* txn)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	PublishingRESTSupportTransaction* _tmp4_;
-	gchar* _tmp5_;
-	gchar* _tmp6_;
-	PublishingPiwigoCategory** _tmp7_;
-	gint _tmp7__length1;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	PublishingPiwigoCategory** _tmp4_;
+	gint _tmp4__length1;
 	GError * _inner_error_ = NULL;
 #line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
@@ -4695,33 +5145,27 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 #line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_debug ("PiwigoPublishing.vala:599: EVENT: on_category_fetch_complete");
 #line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = txn;
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
 #line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_complete_publishing_rest_support_transaction_completed, self);
+	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_complete_publishing_rest_support_transaction_completed, self);
 #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = txn;
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_error_publishing_rest_support_transaction_network_error, self);
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp4_ = txn;
+	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_error_publishing_rest_support_transaction_network_error, self);
 #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
+	_tmp2_ = publishing_rest_support_transaction_get_response (txn);
 #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp6_ = _tmp5_;
+	_tmp3_ = _tmp2_;
 #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:602: PiwigoConnector: list of categories: %s", _tmp6_);
+	g_debug ("PiwigoPublishing.vala:602: PiwigoConnector: list of categories: %s", _tmp3_);
 #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_free0 (_tmp6_);
+	_g_free0 (_tmp3_);
 #line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp7_ = self->priv->categories;
+	_tmp4_ = self->priv->categories;
 #line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp7__length1 = self->priv->categories_length1;
+	_tmp4__length1 = self->priv->categories_length1;
 #line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (_tmp7_ != NULL) {
+	if (_tmp4_ != NULL) {
 #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		self->priv->categories = (_vala_array_free (self->priv->categories, self->priv->categories_length1, (GDestroyNotify) publishing_piwigo_category_unref), NULL);
 #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4730,54 +5174,51 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 		self->priv->categories_length1 = 0;
 #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		self->priv->_categories_size_ = self->priv->categories_length1;
-#line 4728 "PiwigoPublishing.c"
+#line 5172 "PiwigoPublishing.c"
 	}
 	{
 		PublishingRESTSupportXmlDocument* doc = NULL;
-		PublishingRESTSupportTransaction* _tmp8_;
-		gchar* _tmp9_;
-		gchar* _tmp10_;
-		PublishingRESTSupportXmlDocument* _tmp11_;
-		PublishingRESTSupportXmlDocument* _tmp12_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+		PublishingRESTSupportXmlDocument* _tmp7_;
+		PublishingRESTSupportXmlDocument* _tmp8_;
 		xmlNode* root = NULL;
-		PublishingRESTSupportXmlDocument* _tmp13_;
-		xmlNode* _tmp14_;
+		PublishingRESTSupportXmlDocument* _tmp9_;
+		xmlNode* _tmp10_;
 		xmlNode* categories_node = NULL;
-		xmlNode* _tmp15_;
-		xmlNode* _tmp16_;
+		xmlNode* _tmp11_;
+		xmlNode* _tmp12_;
 		xmlNode* category_node_iter = NULL;
-		xmlNode* _tmp17_;
-		xmlNode* _tmp18_;
+		xmlNode* _tmp13_;
+		xmlNode* _tmp14_;
 		xmlNode* name_node = NULL;
 		xmlNode* uppercats_node = NULL;
 		gchar* name = NULL;
-		gchar* _tmp19_;
+		gchar* _tmp15_;
 		gchar* id_string = NULL;
-		gchar* _tmp20_;
+		gchar* _tmp16_;
 		gchar* uppercats = NULL;
-		gchar* _tmp21_;
+		gchar* _tmp17_;
 		GeeHashMap* id_map = NULL;
-		GeeHashMap* _tmp22_;
+		GeeHashMap* _tmp18_;
 #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp8_ = txn;
+		_tmp5_ = publishing_rest_support_transaction_get_response (txn);
 #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp9_ = publishing_rest_support_transaction_get_response (_tmp8_);
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp10_ = _tmp9_;
+		_tmp6_ = _tmp5_;
 #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp11_ = publishing_rest_support_xml_document_parse_string (_tmp10_, _publishing_piwigo_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
+		_tmp7_ = publishing_rest_support_xml_document_parse_string (_tmp6_, _publishing_piwigo_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
 #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp12_ = _tmp11_;
+		_tmp8_ = _tmp7_;
 #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_free0 (_tmp10_);
+		_g_free0 (_tmp6_);
 #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		doc = _tmp12_;
+		doc = _tmp8_;
 #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4774 "PiwigoPublishing.c"
-				goto __catch31_spit_publishing_publishing_error;
+#line 5215 "PiwigoPublishing.c"
+				goto __catch36_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);
@@ -4785,108 +5226,107 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 			g_clear_error (&_inner_error_);
 #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 4783 "PiwigoPublishing.c"
+#line 5224 "PiwigoPublishing.c"
 		}
 #line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp13_ = doc;
+		_tmp9_ = doc;
 #line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp14_ = publishing_rest_support_xml_document_get_root_node (_tmp13_);
+		_tmp10_ = publishing_rest_support_xml_document_get_root_node (_tmp9_);
 #line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		root = _tmp14_;
+		root = _tmp10_;
 #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp15_ = root;
+		_tmp11_ = root;
 #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp16_ = xmlFirstElementChild (_tmp15_);
+		_tmp12_ = xmlFirstElementChild (_tmp11_);
 #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		categories_node = _tmp16_;
+		categories_node = _tmp12_;
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp17_ = categories_node;
+		_tmp13_ = categories_node;
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp18_ = _tmp17_->children;
+		_tmp14_ = _tmp13_->children;
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		category_node_iter = _tmp18_;
+		category_node_iter = _tmp14_;
 #line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp19_ = g_strdup ("");
+		_tmp15_ = g_strdup ("");
 #line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		name = _tmp19_;
+		name = _tmp15_;
 #line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp20_ = g_strdup ("");
+		_tmp16_ = g_strdup ("");
 #line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		id_string = _tmp20_;
+		id_string = _tmp16_;
 #line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp21_ = g_strdup ("");
+		_tmp17_ = g_strdup ("");
 #line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		uppercats = _tmp21_;
+		uppercats = _tmp17_;
 #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp22_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+		_tmp18_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		id_map = _tmp22_;
-#line 4819 "PiwigoPublishing.c"
+		id_map = _tmp18_;
+#line 5260 "PiwigoPublishing.c"
 		{
-			gboolean _tmp23_ = FALSE;
+			gboolean _tmp19_ = FALSE;
 #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp23_ = TRUE;
+			_tmp19_ = TRUE;
 #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			while (TRUE) {
-#line 4826 "PiwigoPublishing.c"
+#line 5267 "PiwigoPublishing.c"
+				xmlNode* _tmp22_;
+				xmlNode* _tmp23_ = NULL;
+				PublishingRESTSupportXmlDocument* _tmp24_;
+				xmlNode* _tmp25_;
 				xmlNode* _tmp26_;
-				xmlNode* _tmp27_ = NULL;
-				PublishingRESTSupportXmlDocument* _tmp28_;
-				xmlNode* _tmp29_;
-				xmlNode* _tmp30_;
+				xmlNode* _tmp27_;
+				gchar* _tmp28_;
+				xmlNode* _tmp29_ = NULL;
+				PublishingRESTSupportXmlDocument* _tmp30_;
 				xmlNode* _tmp31_;
-				gchar* _tmp32_;
-				xmlNode* _tmp33_ = NULL;
-				PublishingRESTSupportXmlDocument* _tmp34_;
+				xmlNode* _tmp32_;
+				xmlNode* _tmp33_;
+				gchar* _tmp34_;
 				xmlNode* _tmp35_;
-				xmlNode* _tmp36_;
-				xmlNode* _tmp37_;
-				gchar* _tmp38_;
-				xmlNode* _tmp39_;
-				gchar* _tmp40_;
-				GeeHashMap* _tmp41_;
-				const gchar* _tmp42_;
+				gchar* _tmp36_;
+				GeeHashMap* _tmp37_;
+				const gchar* _tmp38_;
+				const gchar* _tmp39_;
+				PublishingPiwigoCategory** _tmp40_;
+				gint _tmp40__length1;
+				PublishingPiwigoCategory** _tmp42_;
+				gint _tmp42__length1;
 				const gchar* _tmp43_;
-				PublishingPiwigoCategory** _tmp44_;
-				gint _tmp44__length1;
-				PublishingPiwigoCategory** _tmp46_;
-				gint _tmp46__length1;
-				const gchar* _tmp47_;
-				gint _tmp48_;
-				const gchar* _tmp49_;
-				const gchar* _tmp50_;
-				PublishingPiwigoCategory* _tmp51_;
+				const gchar* _tmp44_;
+				const gchar* _tmp45_;
+				PublishingPiwigoCategory* _tmp46_;
 #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				if (!_tmp23_) {
-#line 4856 "PiwigoPublishing.c"
-					xmlNode* _tmp24_;
-					xmlNode* _tmp25_;
+				if (!_tmp19_) {
+#line 5296 "PiwigoPublishing.c"
+					xmlNode* _tmp20_;
+					xmlNode* _tmp21_;
 #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp24_ = category_node_iter;
+					_tmp20_ = category_node_iter;
 #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp25_ = _tmp24_->next;
+					_tmp21_ = _tmp20_->next;
 #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					category_node_iter = _tmp25_;
-#line 4865 "PiwigoPublishing.c"
+					category_node_iter = _tmp21_;
+#line 5305 "PiwigoPublishing.c"
 				}
 #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp23_ = FALSE;
+				_tmp19_ = FALSE;
 #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp26_ = category_node_iter;
+				_tmp22_ = category_node_iter;
 #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				if (!(_tmp26_ != NULL)) {
+				if (!(_tmp22_ != NULL)) {
 #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					break;
-#line 4875 "PiwigoPublishing.c"
+#line 5315 "PiwigoPublishing.c"
 				}
 #line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp28_ = doc;
+				_tmp24_ = doc;
 #line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp29_ = category_node_iter;
+				_tmp25_ = category_node_iter;
 #line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp30_ = publishing_rest_support_xml_document_get_named_child (_tmp28_, _tmp29_, "name", &_inner_error_);
+				_tmp26_ = publishing_rest_support_xml_document_get_named_child (_tmp24_, _tmp25_, "name", &_inner_error_);
 #line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp27_ = _tmp30_;
+				_tmp23_ = _tmp26_;
 #line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4901,8 +5341,8 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 					_publishing_rest_support_xml_document_unref0 (doc);
 #line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4899 "PiwigoPublishing.c"
-						goto __catch31_spit_publishing_publishing_error;
+#line 5339 "PiwigoPublishing.c"
+						goto __catch36_spit_publishing_publishing_error;
 					}
 #line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_object_unref0 (id_map);
@@ -4920,26 +5360,26 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 					g_clear_error (&_inner_error_);
 #line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					return;
-#line 4918 "PiwigoPublishing.c"
+#line 5358 "PiwigoPublishing.c"
 				}
 #line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				name_node = _tmp27_;
+				name_node = _tmp23_;
 #line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp31_ = name_node;
+				_tmp27_ = name_node;
 #line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp32_ = (gchar*) xmlNodeGetContent (_tmp31_);
+				_tmp28_ = (gchar*) xmlNodeGetContent (_tmp27_);
 #line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_free0 (name);
 #line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				name = _tmp32_;
+				name = _tmp28_;
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp34_ = doc;
+				_tmp30_ = doc;
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp35_ = category_node_iter;
+				_tmp31_ = category_node_iter;
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp36_ = publishing_rest_support_xml_document_get_named_child (_tmp34_, _tmp35_, "uppercats", &_inner_error_);
+				_tmp32_ = publishing_rest_support_xml_document_get_named_child (_tmp30_, _tmp31_, "uppercats", &_inner_error_);
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp33_ = _tmp36_;
+				_tmp29_ = _tmp32_;
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4954,8 +5394,8 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 					_publishing_rest_support_xml_document_unref0 (doc);
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4952 "PiwigoPublishing.c"
-						goto __catch31_spit_publishing_publishing_error;
+#line 5392 "PiwigoPublishing.c"
+						goto __catch36_spit_publishing_publishing_error;
 					}
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_object_unref0 (id_map);
@@ -4973,258 +5413,256 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 					g_clear_error (&_inner_error_);
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					return;
-#line 4971 "PiwigoPublishing.c"
+#line 5411 "PiwigoPublishing.c"
 				}
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				uppercats_node = _tmp33_;
+				uppercats_node = _tmp29_;
 #line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp37_ = uppercats_node;
+				_tmp33_ = uppercats_node;
 #line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp38_ = (gchar*) xmlNodeGetContent (_tmp37_);
+				_tmp34_ = (gchar*) xmlNodeGetContent (_tmp33_);
 #line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_free0 (uppercats);
 #line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				uppercats = (gchar*) _tmp38_;
+				uppercats = (gchar*) _tmp34_;
 #line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp39_ = category_node_iter;
+				_tmp35_ = category_node_iter;
 #line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp40_ = (gchar*) xmlGetProp (_tmp39_, (xmlChar*) "id");
+				_tmp36_ = (gchar*) xmlGetProp (_tmp35_, (xmlChar*) "id");
 #line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_free0 (id_string);
 #line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				id_string = _tmp40_;
+				id_string = _tmp36_;
 #line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp41_ = id_map;
+				_tmp37_ = id_map;
 #line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp42_ = id_string;
+				_tmp38_ = id_string;
 #line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp43_ = name;
+				_tmp39_ = name;
 #line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp42_, _tmp43_);
+				gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp38_, _tmp39_);
 #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp44_ = self->priv->categories;
+				_tmp40_ = self->priv->categories;
 #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp44__length1 = self->priv->categories_length1;
+				_tmp40__length1 = self->priv->categories_length1;
 #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				if (_tmp44_ == NULL) {
-#line 5005 "PiwigoPublishing.c"
-					PublishingPiwigoCategory** _tmp45_;
+				if (_tmp40_ == NULL) {
+#line 5445 "PiwigoPublishing.c"
+					PublishingPiwigoCategory** _tmp41_;
 #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp45_ = g_new0 (PublishingPiwigoCategory*, 0 + 1);
+					_tmp41_ = g_new0 (PublishingPiwigoCategory*, 0 + 1);
 #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					self->priv->categories = (_vala_array_free (self->priv->categories, self->priv->categories_length1, (GDestroyNotify) publishing_piwigo_category_unref), NULL);
 #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					self->priv->categories = _tmp45_;
+					self->priv->categories = _tmp41_;
 #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					self->priv->categories_length1 = 0;
 #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					self->priv->_categories_size_ = self->priv->categories_length1;
-#line 5017 "PiwigoPublishing.c"
+#line 5457 "PiwigoPublishing.c"
 				}
 #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp46_ = self->priv->categories;
+				_tmp42_ = self->priv->categories;
 #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp46__length1 = self->priv->categories_length1;
+				_tmp42__length1 = self->priv->categories_length1;
 #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp47_ = id_string;
+				_tmp43_ = id_string;
 #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp48_ = atoi (_tmp47_);
+				_tmp44_ = name;
 #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp49_ = name;
+				_tmp45_ = uppercats;
 #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp50_ = uppercats;
+				_tmp46_ = publishing_piwigo_category_new (atoi (_tmp43_), _tmp44_, _tmp45_, "");
 #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_add35 (&self->priv->categories, &self->priv->categories_length1, &self->priv->_categories_size_, _tmp51_);
-#line 5035 "PiwigoPublishing.c"
+				_vala_array_add38 (&self->priv->categories, &self->priv->categories_length1, &self->priv->_categories_size_, _tmp46_);
+#line 5473 "PiwigoPublishing.c"
 			}
 		}
 		{
 			gint i = 0;
 #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			i = 0;
-#line 5042 "PiwigoPublishing.c"
+#line 5480 "PiwigoPublishing.c"
 			{
-				gboolean _tmp52_ = FALSE;
+				gboolean _tmp47_ = FALSE;
 #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp52_ = TRUE;
+				_tmp47_ = TRUE;
 #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				while (TRUE) {
-#line 5049 "PiwigoPublishing.c"
-					gint _tmp54_;
-					PublishingPiwigoCategory** _tmp55_;
-					gint _tmp55__length1;
+#line 5487 "PiwigoPublishing.c"
+					gint _tmp49_;
+					PublishingPiwigoCategory** _tmp50_;
+					gint _tmp50__length1;
 					gchar** upcatids = NULL;
-					PublishingPiwigoCategory** _tmp56_;
-					gint _tmp56__length1;
-					gint _tmp57_;
-					PublishingPiwigoCategory* _tmp58_;
-					const gchar* _tmp59_;
-					gchar** _tmp60_;
-					gchar** _tmp61_;
+					PublishingPiwigoCategory** _tmp51_;
+					gint _tmp51__length1;
+					gint _tmp52_;
+					PublishingPiwigoCategory* _tmp53_;
+					const gchar* _tmp54_;
+					gchar** _tmp55_;
+					gchar** _tmp56_;
 					gint upcatids_length1;
 					gint _upcatids_size_;
 					GString* builder = NULL;
-					GString* _tmp62_;
-					PublishingPiwigoCategory** _tmp76_;
-					gint _tmp76__length1;
-					gint _tmp77_;
-					PublishingPiwigoCategory* _tmp78_;
-					GString* _tmp79_;
-					const gchar* _tmp80_;
-					gchar* _tmp81_;
+					GString* _tmp57_;
+					PublishingPiwigoCategory** _tmp71_;
+					gint _tmp71__length1;
+					gint _tmp72_;
+					PublishingPiwigoCategory* _tmp73_;
+					GString* _tmp74_;
+					const gchar* _tmp75_;
+					gchar* _tmp76_;
 #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					if (!_tmp52_) {
-#line 5074 "PiwigoPublishing.c"
-						gint _tmp53_;
+					if (!_tmp47_) {
+#line 5512 "PiwigoPublishing.c"
+						gint _tmp48_;
 #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-						_tmp53_ = i;
+						_tmp48_ = i;
 #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-						i = _tmp53_ + 1;
-#line 5080 "PiwigoPublishing.c"
+						i = _tmp48_ + 1;
+#line 5518 "PiwigoPublishing.c"
 					}
 #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp52_ = FALSE;
+					_tmp47_ = FALSE;
 #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp54_ = i;
+					_tmp49_ = i;
 #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp55_ = self->priv->categories;
+					_tmp50_ = self->priv->categories;
 #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp55__length1 = self->priv->categories_length1;
+					_tmp50__length1 = self->priv->categories_length1;
 #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					if (!(_tmp54_ < _tmp55__length1)) {
+					if (!(_tmp49_ < _tmp50__length1)) {
 #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						break;
-#line 5094 "PiwigoPublishing.c"
+#line 5532 "PiwigoPublishing.c"
 					}
 #line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp56_ = self->priv->categories;
+					_tmp51_ = self->priv->categories;
 #line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp56__length1 = self->priv->categories_length1;
+					_tmp51__length1 = self->priv->categories_length1;
 #line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp57_ = i;
+					_tmp52_ = i;
 #line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp58_ = _tmp56_[_tmp57_];
+					_tmp53_ = _tmp51_[_tmp52_];
 #line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp59_ = _tmp58_->uppercats;
+					_tmp54_ = _tmp53_->uppercats;
 #line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp61_ = _tmp60_ = g_strsplit (_tmp59_, ",", 0);
+					_tmp56_ = _tmp55_ = g_strsplit (_tmp54_, ",", 0);
 #line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					upcatids = _tmp61_;
+					upcatids = _tmp56_;
 #line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					upcatids_length1 = _vala_array_length (_tmp60_);
+					upcatids_length1 = _vala_array_length (_tmp55_);
 #line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_upcatids_size_ = upcatids_length1;
 #line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp62_ = g_string_new ("");
+					_tmp57_ = g_string_new ("");
 #line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					builder = _tmp62_;
-#line 5118 "PiwigoPublishing.c"
+					builder = _tmp57_;
+#line 5556 "PiwigoPublishing.c"
 					{
 						gint j = 0;
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						j = 0;
-#line 5123 "PiwigoPublishing.c"
+#line 5561 "PiwigoPublishing.c"
 						{
-							gboolean _tmp63_ = FALSE;
+							gboolean _tmp58_ = FALSE;
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-							_tmp63_ = TRUE;
+							_tmp58_ = TRUE;
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 							while (TRUE) {
-#line 5130 "PiwigoPublishing.c"
-								gint _tmp65_;
-								gchar** _tmp66_;
-								gint _tmp66__length1;
-								GString* _tmp67_;
-								GString* _tmp68_;
-								GeeHashMap* _tmp69_;
-								gchar** _tmp70_;
-								gint _tmp70__length1;
-								gint _tmp71_;
-								const gchar* _tmp72_;
-								gpointer _tmp73_;
-								gchar* _tmp74_;
-								GString* _tmp75_;
+#line 5568 "PiwigoPublishing.c"
+								gint _tmp60_;
+								gchar** _tmp61_;
+								gint _tmp61__length1;
+								GString* _tmp62_;
+								GString* _tmp63_;
+								GeeHashMap* _tmp64_;
+								gchar** _tmp65_;
+								gint _tmp65__length1;
+								gint _tmp66_;
+								const gchar* _tmp67_;
+								gpointer _tmp68_;
+								gchar* _tmp69_;
+								GString* _tmp70_;
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-								if (!_tmp63_) {
-#line 5146 "PiwigoPublishing.c"
-									gint _tmp64_;
+								if (!_tmp58_) {
+#line 5584 "PiwigoPublishing.c"
+									gint _tmp59_;
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-									_tmp64_ = j;
+									_tmp59_ = j;
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-									j = _tmp64_ + 1;
-#line 5152 "PiwigoPublishing.c"
+									j = _tmp59_ + 1;
+#line 5590 "PiwigoPublishing.c"
 								}
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-								_tmp63_ = FALSE;
+								_tmp58_ = FALSE;
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-								_tmp65_ = j;
+								_tmp60_ = j;
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-								_tmp66_ = upcatids;
+								_tmp61_ = upcatids;
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-								_tmp66__length1 = upcatids_length1;
+								_tmp61__length1 = upcatids_length1;
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-								if (!(_tmp65_ < _tmp66__length1)) {
+								if (!(_tmp60_ < _tmp61__length1)) {
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 									break;
-#line 5166 "PiwigoPublishing.c"
+#line 5604 "PiwigoPublishing.c"
 								}
 #line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-								_tmp67_ = builder;
+								_tmp62_ = builder;
 #line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-								g_string_append (_tmp67_, "/ ");
+								g_string_append (_tmp62_, "/ ");
 #line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-								_tmp68_ = builder;
+								_tmp63_ = builder;
 #line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-								_tmp69_ = id_map;
+								_tmp64_ = id_map;
 #line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-								_tmp70_ = upcatids;
+								_tmp65_ = upcatids;
 #line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-								_tmp70__length1 = upcatids_length1;
+								_tmp65__length1 = upcatids_length1;
 #line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-								_tmp71_ = j;
+								_tmp66_ = j;
 #line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-								_tmp72_ = _tmp70_[_tmp71_];
+								_tmp67_ = _tmp65_[_tmp66_];
 #line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-								_tmp73_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp72_);
+								_tmp68_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp67_);
 #line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-								_tmp74_ = (gchar*) _tmp73_;
+								_tmp69_ = (gchar*) _tmp68_;
 #line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-								g_string_append (_tmp68_, _tmp74_);
+								g_string_append (_tmp63_, _tmp69_);
 #line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-								_g_free0 (_tmp74_);
+								_g_free0 (_tmp69_);
 #line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-								_tmp75_ = builder;
+								_tmp70_ = builder;
 #line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-								g_string_append (_tmp75_, " ");
-#line 5196 "PiwigoPublishing.c"
+								g_string_append (_tmp70_, " ");
+#line 5634 "PiwigoPublishing.c"
 							}
 						}
 					}
 #line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp76_ = self->priv->categories;
+					_tmp71_ = self->priv->categories;
 #line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp76__length1 = self->priv->categories_length1;
+					_tmp71__length1 = self->priv->categories_length1;
 #line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp77_ = i;
+					_tmp72_ = i;
 #line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp78_ = _tmp76_[_tmp77_];
+					_tmp73_ = _tmp71_[_tmp72_];
 #line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp79_ = builder;
+					_tmp74_ = builder;
 #line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp80_ = _tmp79_->str;
+					_tmp75_ = _tmp74_->str;
 #line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp81_ = g_strdup (_tmp80_);
+					_tmp76_ = g_strdup (_tmp75_);
 #line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_g_free0 (_tmp78_->display_name);
+					_g_free0 (_tmp73_->display_name);
 #line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp78_->display_name = _tmp81_;
+					_tmp73_->display_name = _tmp76_;
 #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_string_free0 (builder);
 #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					upcatids = (_vala_array_free (upcatids, upcatids_length1, (GDestroyNotify) g_free), NULL);
-#line 5222 "PiwigoPublishing.c"
+#line 5660 "PiwigoPublishing.c"
 				}
 			}
 		}
@@ -5238,13 +5676,13 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 		_g_free0 (name);
 #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (doc);
-#line 5236 "PiwigoPublishing.c"
+#line 5674 "PiwigoPublishing.c"
 	}
-	goto __finally31;
-	__catch31_spit_publishing_publishing_error:
+	goto __finally36;
+	__catch36_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		GError* _tmp82_;
+		GError* _tmp77_;
 #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		err = _inner_error_;
 #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5252,16 +5690,16 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 #line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_debug ("PiwigoPublishing.vala:648: ERROR: on_category_fetch_complete");
 #line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp82_ = err;
+		_tmp77_ = err;
 #line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp82_);
+		publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp77_);
 #line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_error_free0 (err);
 #line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 5257 "PiwigoPublishing.c"
+#line 5695 "PiwigoPublishing.c"
 	}
-	__finally31:
+	__finally36:
 #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"
@@ -5270,11 +5708,11 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 		g_clear_error (&_inner_error_);
 #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 5268 "PiwigoPublishing.c"
+#line 5706 "PiwigoPublishing.c"
 	}
 #line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_do_show_publishing_options_pane (self);
-#line 5272 "PiwigoPublishing.c"
+#line 5710 "PiwigoPublishing.c"
 }
 
 
@@ -5282,13 +5720,13 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
      * Event triggered when the fetch categories transaction fails due to a
      * network error.
      */
-static void publishing_piwigo_piwigo_publisher_on_category_fetch_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_piwigo_piwigo_publisher_on_category_fetch_error (PublishingPiwigoPiwigoPublisher* self,
+                                                            PublishingRESTSupportTransaction* bad_txn,
+                                                            GError* err)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	PublishingRESTSupportTransaction* _tmp4_;
-	GError* _tmp5_;
 #line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5296,24 +5734,16 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_error (Publishi
 #line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_debug ("PiwigoPublishing.vala:664: EVENT: on_category_fetch_error");
 #line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = bad_txn;
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
 #line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_complete_publishing_rest_support_transaction_completed, self);
-#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = bad_txn;
+	g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_complete_publishing_rest_support_transaction_completed, self);
 #line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_error_publishing_rest_support_transaction_network_error, self);
-#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp4_ = bad_txn;
-#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp5_ = err;
+	g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_error_publishing_rest_support_transaction_network_error, self);
 #line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	publishing_piwigo_piwigo_publisher_on_network_error (self, _tmp4_, _tmp5_);
-#line 5311 "PiwigoPublishing.c"
+	publishing_piwigo_piwigo_publisher_on_network_error (self, bad_txn, err);
+#line 5741 "PiwigoPublishing.c"
 }
 
 
@@ -5322,36 +5752,40 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_error (Publishi
      *
      * This action method shows the publishing options pane.
      */
-static void _publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout_clicked_publishing_piwigo_publishing_options_pane_logout (PublishingPiwigoPublishingOptionsPane* _sender, gpointer self) {
+static void
+_publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout_clicked_publishing_piwigo_publishing_options_pane_logout (PublishingPiwigoPublishingOptionsPane* _sender,
+                                                                                                                                gpointer self)
+{
 #line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout_clicked ((PublishingPiwigoPiwigoPublisher*) self);
-#line 5323 "PiwigoPublishing.c"
+#line 5756 "PiwigoPublishing.c"
 }
 
 
-static void _publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publish_clicked_publishing_piwigo_publishing_options_pane_publish (PublishingPiwigoPublishingOptionsPane* _sender, PublishingPiwigoPublishingParameters* parameters, gboolean strip_metadata, gpointer self) {
+static void
+_publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publish_clicked_publishing_piwigo_publishing_options_pane_publish (PublishingPiwigoPublishingOptionsPane* _sender,
+                                                                                                                                  PublishingPiwigoPublishingParameters* parameters,
+                                                                                                                                  gboolean strip_metadata,
+                                                                                                                                  gpointer self)
+{
 #line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publish_clicked ((PublishingPiwigoPiwigoPublisher*) self, parameters, strip_metadata);
-#line 5330 "PiwigoPublishing.c"
+#line 5768 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_piwigo_publisher_do_show_publishing_options_pane (PublishingPiwigoPiwigoPublisher* self) {
+static void
+publishing_piwigo_piwigo_publisher_do_show_publishing_options_pane (PublishingPiwigoPiwigoPublisher* self)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	PublishingPiwigoPublishingOptionsPane* opts_pane = NULL;
 	PublishingPiwigoCategory** _tmp1_;
 	gint _tmp1__length1;
-	gint _tmp2_;
-	gint _tmp3_;
-	gint _tmp4_;
-	gboolean _tmp5_;
-	gboolean _tmp6_;
-	gboolean _tmp7_;
-	PublishingPiwigoPublishingOptionsPane* _tmp8_;
-	SpitPublishingPluginHost* _tmp9_;
-	SpitPublishingPluginHost* _tmp10_;
-	GtkWidget* _tmp11_;
-	GtkWidget* _tmp12_;
+	PublishingPiwigoPublishingOptionsPane* _tmp2_;
+	SpitPublishingPluginHost* _tmp3_;
+	SpitPublishingPluginHost* _tmp4_;
+	GtkWidget* _tmp5_;
+	GtkWidget* _tmp6_;
 #line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5365,63 +5799,60 @@ static void publishing_piwigo_piwigo_publisher_do_show_publishing_options_pane (
 #line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1__length1 = self->priv->categories_length1;
 #line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = publishing_piwigo_piwigo_publisher_get_last_category (self);
-#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp3_ = publishing_piwigo_piwigo_publisher_get_last_permission_level (self);
-#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp4_ = publishing_piwigo_piwigo_publisher_get_last_photo_size (self);
-#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp5_ = publishing_piwigo_piwigo_publisher_get_last_title_as_comment (self);
-#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp6_ = publishing_piwigo_piwigo_publisher_get_last_no_upload_tags (self);
-#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp7_ = publishing_piwigo_piwigo_publisher_get_metadata_removal_choice (self);
-#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp8_ = publishing_piwigo_publishing_options_pane_new (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_, _tmp4_, _tmp5_, _tmp6_, _tmp7_);
+	_tmp2_ = publishing_piwigo_publishing_options_pane_new (self, _tmp1_, _tmp1__length1, publishing_piwigo_piwigo_publisher_get_last_category (self), publishing_piwigo_piwigo_publisher_get_last_permission_level (self), publishing_piwigo_piwigo_publisher_get_last_photo_size (self), publishing_piwigo_piwigo_publisher_get_last_title_as_comment (self), publishing_piwigo_piwigo_publisher_get_last_no_upload_tags (self), publishing_piwigo_piwigo_publisher_get_metadata_removal_choice (self));
 #line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	opts_pane = _tmp8_;
+	opts_pane = _tmp2_;
 #line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (opts_pane, "logout", (GCallback) _publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout_clicked_publishing_piwigo_publishing_options_pane_logout, self, 0);
 #line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (opts_pane, "publish", (GCallback) _publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publish_clicked_publishing_piwigo_publishing_options_pane_publish, self, 0);
 #line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp9_ = self->priv->host;
+	_tmp3_ = self->priv->host;
 #line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	spit_publishing_plugin_host_install_dialog_pane (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (opts_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
+	spit_publishing_plugin_host_install_dialog_pane (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (opts_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
 #line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp10_ = self->priv->host;
+	_tmp4_ = self->priv->host;
 #line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp11_ = shotwell_plugins_common_builder_pane_get_default_widget (G_TYPE_CHECK_INSTANCE_CAST (opts_pane, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
+	_tmp5_ = shotwell_plugins_common_builder_pane_get_default_widget (G_TYPE_CHECK_INSTANCE_CAST (opts_pane, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
 #line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp12_ = _tmp11_;
+	_tmp6_ = _tmp5_;
 #line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	spit_publishing_plugin_host_set_dialog_default_widget (_tmp10_, _tmp12_);
+	spit_publishing_plugin_host_set_dialog_default_widget (_tmp4_, _tmp6_);
 #line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_object_unref0 (_tmp12_);
+	_g_object_unref0 (_tmp6_);
 #line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (opts_pane);
-#line 5398 "PiwigoPublishing.c"
+#line 5820 "PiwigoPublishing.c"
 }
 
 
 /**
      * Event triggered when the user clicks logout in the publishing options pane.
      */
-static void _publishing_piwigo_piwigo_publisher_on_logout_network_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_piwigo_piwigo_publisher_on_logout_network_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                               GError* err,
+                                                                                                               gpointer self)
+{
 #line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_logout_network_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err);
-#line 5408 "PiwigoPublishing.c"
+#line 5834 "PiwigoPublishing.c"
 }
 
 
-static void _publishing_piwigo_piwigo_publisher_on_logout_network_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_piwigo_piwigo_publisher_on_logout_network_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                              gpointer self)
+{
 #line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_logout_network_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender);
-#line 5415 "PiwigoPublishing.c"
+#line 5844 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout_clicked (PublishingPiwigoPiwigoPublisher* self) {
+static void
+publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout_clicked (PublishingPiwigoPiwigoPublisher* self)
+{
 	PublishingPiwigoSessionLogoutTransaction* logout_trans = NULL;
 	PublishingPiwigoSession* _tmp0_;
 	PublishingPiwigoSessionLogoutTransaction* _tmp1_;
@@ -5441,7 +5872,7 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (logout_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_error_publishing_rest_support_transaction_network_error, self, 0);
 #line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (logout_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 5438 "PiwigoPublishing.c"
+#line 5869 "PiwigoPublishing.c"
 	{
 #line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (logout_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -5449,8 +5880,8 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5446 "PiwigoPublishing.c"
-				goto __catch32_spit_publishing_publishing_error;
+#line 5877 "PiwigoPublishing.c"
+				goto __catch37_spit_publishing_publishing_error;
 			}
 #line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (logout_trans);
@@ -5460,11 +5891,11 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout
 			g_clear_error (&_inner_error_);
 #line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 5457 "PiwigoPublishing.c"
+#line 5888 "PiwigoPublishing.c"
 		}
 	}
-	goto __finally32;
-	__catch32_spit_publishing_publishing_error:
+	goto __finally37;
+	__catch37_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		GError* _tmp2_;
@@ -5481,9 +5912,9 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout
 		publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp2_);
 #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_error_free0 (err);
-#line 5477 "PiwigoPublishing.c"
+#line 5908 "PiwigoPublishing.c"
 	}
-	__finally32:
+	__finally37:
 #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"
@@ -5494,11 +5925,11 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout
 		g_clear_error (&_inner_error_);
 #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 5490 "PiwigoPublishing.c"
+#line 5921 "PiwigoPublishing.c"
 	}
 #line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (logout_trans);
-#line 5494 "PiwigoPublishing.c"
+#line 5925 "PiwigoPublishing.c"
 }
 
 
@@ -5508,12 +5939,13 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout
      * This event de-authenticates the session and shows the authentication
      * pane again.
      */
-static void publishing_piwigo_piwigo_publisher_on_logout_network_complete (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_piwigo_piwigo_publisher_on_logout_network_complete (PublishingPiwigoPiwigoPublisher* self,
+                                                               PublishingRESTSupportTransaction* txn)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	PublishingPiwigoSession* _tmp4_;
+	PublishingPiwigoSession* _tmp2_;
 #line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5521,37 +5953,33 @@ static void publishing_piwigo_piwigo_publisher_on_logout_network_complete (Publi
 #line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_debug ("PiwigoPublishing.vala:712: EVENT: on_logout_network_complete");
 #line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = txn;
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
 #line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_complete_publishing_rest_support_transaction_completed, self);
-#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = txn;
+	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_complete_publishing_rest_support_transaction_completed, self);
 #line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_error_publishing_rest_support_transaction_network_error, self);
+	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_error_publishing_rest_support_transaction_network_error, self);
 #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp4_ = self->priv->session;
+	_tmp2_ = self->priv->session;
 #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	publishing_piwigo_session_deauthenticate (_tmp4_);
+	publishing_piwigo_session_deauthenticate (_tmp2_);
 #line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_do_show_authentication_pane (self, PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_INTRO);
-#line 5534 "PiwigoPublishing.c"
+#line 5962 "PiwigoPublishing.c"
 }
 
 
 /**
      * Event triggered when the logout action fails due to a network error.
      */
-static void publishing_piwigo_piwigo_publisher_on_logout_network_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_piwigo_piwigo_publisher_on_logout_network_error (PublishingPiwigoPiwigoPublisher* self,
+                                                            PublishingRESTSupportTransaction* bad_txn,
+                                                            GError* err)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	PublishingRESTSupportTransaction* _tmp4_;
-	GError* _tmp5_;
 #line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5559,24 +5987,16 @@ static void publishing_piwigo_piwigo_publisher_on_logout_network_error (Publishi
 #line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_debug ("PiwigoPublishing.vala:728: EVENT: on_logout_network_error");
 #line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = bad_txn;
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
 #line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_complete_publishing_rest_support_transaction_completed, self);
-#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = bad_txn;
+	g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_complete_publishing_rest_support_transaction_completed, self);
 #line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_error_publishing_rest_support_transaction_network_error, self);
-#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp4_ = bad_txn;
-#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp5_ = err;
+	g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_error_publishing_rest_support_transaction_network_error, self);
 #line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	publishing_piwigo_piwigo_publisher_on_network_error (self, _tmp4_, _tmp5_);
-#line 5572 "PiwigoPublishing.c"
+	publishing_piwigo_piwigo_publisher_on_network_error (self, bad_txn, err);
+#line 5992 "PiwigoPublishing.c"
 }
 
 
@@ -5590,20 +6010,22 @@ static void publishing_piwigo_piwigo_publisher_on_logout_network_error (Publishi
      *
      * @param parameters the publishing parameters
      */
-static gpointer _publishing_piwigo_publishing_parameters_ref0 (gpointer self) {
+static gpointer
+_publishing_piwigo_publishing_parameters_ref0 (gpointer self)
+{
 #line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self ? publishing_piwigo_publishing_parameters_ref (self) : NULL;
-#line 5589 "PiwigoPublishing.c"
+#line 6011 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publish_clicked (PublishingPiwigoPiwigoPublisher* self, PublishingPiwigoPublishingParameters* parameters, gboolean strip_metadata) {
+static void
+publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publish_clicked (PublishingPiwigoPiwigoPublisher* self,
+                                                                               PublishingPiwigoPublishingParameters* parameters,
+                                                                               gboolean strip_metadata)
+{
 	PublishingPiwigoPublishingParameters* _tmp0_;
-	PublishingPiwigoPublishingParameters* _tmp1_;
-	gboolean _tmp2_;
-	PublishingPiwigoPublishingParameters* _tmp3_;
-	PublishingPiwigoCategory* _tmp4_;
-	gboolean _tmp5_;
+	PublishingPiwigoCategory* _tmp1_;
 #line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5612,42 +6034,31 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publis
 	g_debug ("PiwigoPublishing.vala:746: EVENT: on_publishing_options_pane_publish_c" \
 "licked");
 #line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = parameters;
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = _publishing_piwigo_publishing_parameters_ref0 (_tmp0_);
+	_tmp0_ = _publishing_piwigo_publishing_parameters_ref0 (parameters);
 #line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_piwigo_publishing_parameters_unref0 (self->priv->parameters);
 #line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->parameters = _tmp1_;
+	self->priv->parameters = _tmp0_;
 #line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = strip_metadata;
-#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->strip_metadata = _tmp2_;
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp3_ = parameters;
+	self->priv->strip_metadata = strip_metadata;
 #line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp4_ = _tmp3_->category;
+	_tmp1_ = parameters->category;
 #line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp5_ = publishing_piwigo_category_is_local (_tmp4_);
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (_tmp5_) {
-#line 5626 "PiwigoPublishing.c"
-		PublishingPiwigoPublishingParameters* _tmp6_;
-		PublishingPiwigoCategory* _tmp7_;
+	if (publishing_piwigo_category_is_local (_tmp1_)) {
+#line 6040 "PiwigoPublishing.c"
+		PublishingPiwigoCategory* _tmp2_;
 #line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp6_ = parameters;
+		_tmp2_ = parameters->category;
 #line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp7_ = _tmp6_->category;
-#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		publishing_piwigo_piwigo_publisher_do_create_category (self, _tmp7_);
-#line 5635 "PiwigoPublishing.c"
+		publishing_piwigo_piwigo_publisher_do_create_category (self, _tmp2_);
+#line 6046 "PiwigoPublishing.c"
 	} else {
-		gboolean _tmp8_;
+		gboolean _tmp3_;
 #line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp8_ = self->priv->strip_metadata;
+		_tmp3_ = self->priv->strip_metadata;
 #line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		publishing_piwigo_piwigo_publisher_do_upload (self, _tmp8_);
-#line 5642 "PiwigoPublishing.c"
+		publishing_piwigo_piwigo_publisher_do_upload (self, _tmp3_);
+#line 6053 "PiwigoPublishing.c"
 	}
 }
 
@@ -5663,143 +6074,131 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publis
      *
      * @param category the new category to create on the server
      */
-static gchar* string_strip (const gchar* self) {
+static gchar*
+string_strip (const gchar* self)
+{
 	gchar* result = NULL;
 	gchar* _result_ = NULL;
 	gchar* _tmp0_;
 	const gchar* _tmp1_;
-#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1248 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1249 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1249 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1250 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1250 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1251 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1251 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	return result;
-#line 5677 "PiwigoPublishing.c"
+#line 6090 "PiwigoPublishing.c"
 }
 
 
-static void _publishing_piwigo_piwigo_publisher_on_category_add_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+static void
+_publishing_piwigo_piwigo_publisher_on_category_add_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                             GError* err,
+                                                                                                             gpointer self)
+{
 #line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_category_add_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err);
-#line 5684 "PiwigoPublishing.c"
+#line 6101 "PiwigoPublishing.c"
 }
 
 
-static void _publishing_piwigo_piwigo_publisher_on_category_add_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+static void
+_publishing_piwigo_piwigo_publisher_on_category_add_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                            gpointer self)
+{
 #line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_category_add_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender);
-#line 5691 "PiwigoPublishing.c"
+#line 6111 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiwigoPiwigoPublisher* self, PublishingPiwigoCategory* category) {
-	PublishingPiwigoCategory* _tmp0_;
-	const gchar* _tmp1_;
+static void
+publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiwigoPiwigoPublisher* self,
+                                                       PublishingPiwigoCategory* category)
+{
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 	gchar* _tmp2_;
-	gchar* _tmp3_;
-	PublishingPiwigoCategory* _tmp4_;
-	gboolean _tmp5_;
-	SpitPublishingPluginHost* _tmp6_;
-	SpitPublishingPluginHost* _tmp7_;
-	PublishingPiwigoCategory* _tmp8_;
+	SpitPublishingPluginHost* _tmp3_;
+	SpitPublishingPluginHost* _tmp4_;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	PublishingPiwigoCategoriesAddTransaction* creation_trans = NULL;
+	PublishingPiwigoSession* _tmp8_;
 	const gchar* _tmp9_;
 	gchar* _tmp10_;
 	gchar* _tmp11_;
-	PublishingPiwigoCategoriesAddTransaction* creation_trans = NULL;
-	PublishingPiwigoSession* _tmp12_;
-	PublishingPiwigoCategory* _tmp13_;
-	const gchar* _tmp14_;
-	gchar* _tmp15_;
-	gchar* _tmp16_;
-	PublishingPiwigoCategory* _tmp17_;
-	const gchar* _tmp18_;
-	gint _tmp19_;
-	PublishingPiwigoCategory* _tmp20_;
-	const gchar* _tmp21_;
-	PublishingPiwigoCategoriesAddTransaction* _tmp22_;
-	PublishingPiwigoCategoriesAddTransaction* _tmp23_;
+	const gchar* _tmp12_;
+	const gchar* _tmp13_;
+	PublishingPiwigoCategoriesAddTransaction* _tmp14_;
+	PublishingPiwigoCategoriesAddTransaction* _tmp15_;
 	GError * _inner_error_ = NULL;
 #line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_CATEGORY (category));
 #line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = category;
-#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = _tmp0_->name;
+	_tmp0_ = category->name;
 #line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = g_strdup_printf ("ACTION: creating a new category: %s", _tmp1_);
+	_tmp1_ = g_strdup_printf ("ACTION: creating a new category: %s", _tmp0_);
 #line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp3_ = _tmp2_;
+	_tmp2_ = _tmp1_;
 #line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:769: %s", _tmp3_);
+	g_debug ("PiwigoPublishing.vala:769: %s", _tmp2_);
 #line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_free0 (_tmp3_);
-#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp4_ = category;
-#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp5_ = publishing_piwigo_category_is_local (_tmp4_);
+	_g_free0 (_tmp2_);
 #line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_assert (_tmp5_, "category.is_local()");
+	_vala_assert (publishing_piwigo_category_is_local (category), "category.is_local()");
 #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp6_ = self->priv->host;
+	_tmp3_ = self->priv->host;
 #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp6_, TRUE);
-#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp7_ = self->priv->host;
+	spit_publishing_plugin_host_set_service_locked (_tmp3_, TRUE);
 #line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp8_ = category;
+	_tmp4_ = self->priv->host;
 #line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp9_ = _tmp8_->name;
+	_tmp5_ = category->name;
 #line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp10_ = g_strdup_printf (_ ("Creating album %s…"), _tmp9_);
+	_tmp6_ = g_strdup_printf (_ ("Creating album %s…"), _tmp5_);
 #line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp11_ = _tmp10_;
+	_tmp7_ = _tmp6_;
 #line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	spit_publishing_plugin_host_install_static_message_pane (_tmp7_, _tmp11_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+	spit_publishing_plugin_host_install_static_message_pane (_tmp4_, _tmp7_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
 #line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_free0 (_tmp11_);
+	_g_free0 (_tmp7_);
 #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp12_ = self->priv->session;
+	_tmp8_ = self->priv->session;
 #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp13_ = category;
+	_tmp9_ = category->name;
 #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp14_ = _tmp13_->name;
+	_tmp10_ = string_strip (_tmp9_);
 #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp15_ = string_strip (_tmp14_);
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp16_ = _tmp15_;
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp17_ = category;
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp18_ = _tmp17_->uppercats;
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp19_ = atoi (_tmp18_);
+	_tmp11_ = _tmp10_;
 #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp20_ = category;
+	_tmp12_ = category->uppercats;
 #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp21_ = _tmp20_->comment;
+	_tmp13_ = category->comment;
 #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp22_ = publishing_piwigo_categories_add_transaction_new (_tmp12_, _tmp16_, _tmp19_, _tmp21_);
+	_tmp14_ = publishing_piwigo_categories_add_transaction_new (_tmp8_, _tmp11_, atoi (_tmp12_), _tmp13_);
 #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp23_ = _tmp22_;
+	_tmp15_ = _tmp14_;
 #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_free0 (_tmp16_);
+	_g_free0 (_tmp11_);
 #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	creation_trans = _tmp23_;
+	creation_trans = _tmp15_;
 #line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (creation_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_error_publishing_rest_support_transaction_network_error, self, 0);
 #line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (creation_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 5794 "PiwigoPublishing.c"
+#line 6193 "PiwigoPublishing.c"
 	{
 #line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (creation_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -5807,8 +6206,8 @@ static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiw
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5802 "PiwigoPublishing.c"
-				goto __catch33_spit_publishing_publishing_error;
+#line 6201 "PiwigoPublishing.c"
+				goto __catch38_spit_publishing_publishing_error;
 			}
 #line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (creation_trans);
@@ -5818,14 +6217,14 @@ static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiw
 			g_clear_error (&_inner_error_);
 #line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 5813 "PiwigoPublishing.c"
+#line 6212 "PiwigoPublishing.c"
 		}
 	}
-	goto __finally33;
-	__catch33_spit_publishing_publishing_error:
+	goto __finally38;
+	__catch38_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		GError* _tmp24_;
+		GError* _tmp16_;
 #line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		err = _inner_error_;
 #line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5833,14 +6232,14 @@ static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiw
 #line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_debug ("PiwigoPublishing.vala:783: ERROR: do_create_category");
 #line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp24_ = err;
+		_tmp16_ = err;
 #line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp24_);
+		publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp16_);
 #line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_error_free0 (err);
-#line 5833 "PiwigoPublishing.c"
+#line 6232 "PiwigoPublishing.c"
 	}
-	__finally33:
+	__finally38:
 #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"
@@ -5851,11 +6250,11 @@ static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiw
 		g_clear_error (&_inner_error_);
 #line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 5846 "PiwigoPublishing.c"
+#line 6245 "PiwigoPublishing.c"
 	}
 #line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (creation_trans);
-#line 5850 "PiwigoPublishing.c"
+#line 6249 "PiwigoPublishing.c"
 }
 
 
@@ -5866,11 +6265,12 @@ static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiw
      * transaction and assigns that ID to the category currently held in
      * the publishing parameters. It then calls the upload action.
      */
-static void publishing_piwigo_piwigo_publisher_on_category_add_complete (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_piwigo_piwigo_publisher_on_category_add_complete (PublishingPiwigoPiwigoPublisher* self,
+                                                             PublishingRESTSupportTransaction* txn)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
@@ -5879,63 +6279,55 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish
 #line 796 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_debug ("PiwigoPublishing.vala:796: EVENT: on_category_add_complete");
 #line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = txn;
-#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
 #line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_complete_publishing_rest_support_transaction_completed, self);
-#line 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = txn;
+	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_complete_publishing_rest_support_transaction_completed, self);
 #line 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #line 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_error_publishing_rest_support_transaction_network_error, self);
-#line 5885 "PiwigoPublishing.c"
+	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_error_publishing_rest_support_transaction_network_error, self);
+#line 6281 "PiwigoPublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* doc = NULL;
-		PublishingRESTSupportTransaction* _tmp4_;
-		gchar* _tmp5_;
-		gchar* _tmp6_;
-		PublishingRESTSupportXmlDocument* _tmp7_;
-		PublishingRESTSupportXmlDocument* _tmp8_;
+		gchar* _tmp2_;
+		gchar* _tmp3_;
+		PublishingRESTSupportXmlDocument* _tmp4_;
+		PublishingRESTSupportXmlDocument* _tmp5_;
 		xmlNode* rsp = NULL;
+		PublishingRESTSupportXmlDocument* _tmp6_;
+		xmlNode* _tmp7_;
+		xmlNode* id_node = NULL;
+		xmlNode* _tmp8_ = NULL;
 		PublishingRESTSupportXmlDocument* _tmp9_;
 		xmlNode* _tmp10_;
-		xmlNode* id_node = NULL;
-		xmlNode* _tmp11_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp12_;
-		xmlNode* _tmp13_;
-		xmlNode* _tmp14_;
+		xmlNode* _tmp11_;
 		gchar* id_string = NULL;
-		xmlNode* _tmp15_;
-		gchar* _tmp16_;
+		xmlNode* _tmp12_;
+		gchar* _tmp13_;
 		gint id = 0;
-		const gchar* _tmp17_;
-		gint _tmp18_;
-		PublishingPiwigoPublishingParameters* _tmp19_;
-		PublishingPiwigoCategory* _tmp20_;
-		gint _tmp21_;
-		gboolean _tmp22_;
+		const gchar* _tmp14_;
+		PublishingPiwigoPublishingParameters* _tmp15_;
+		PublishingPiwigoCategory* _tmp16_;
+		gint _tmp17_;
+		gboolean _tmp18_;
 #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp4_ = txn;
+		_tmp2_ = publishing_rest_support_transaction_get_response (txn);
 #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
+		_tmp3_ = _tmp2_;
 #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp6_ = _tmp5_;
-#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp7_ = publishing_rest_support_xml_document_parse_string (_tmp6_, _publishing_piwigo_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
+		_tmp4_ = publishing_rest_support_xml_document_parse_string (_tmp3_, _publishing_piwigo_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
 #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp8_ = _tmp7_;
+		_tmp5_ = _tmp4_;
 #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_free0 (_tmp6_);
+		_g_free0 (_tmp3_);
 #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		doc = _tmp8_;
+		doc = _tmp5_;
 #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5929 "PiwigoPublishing.c"
-				goto __catch34_spit_publishing_publishing_error;
+#line 6321 "PiwigoPublishing.c"
+				goto __catch39_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);
@@ -5943,30 +6335,30 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish
 			g_clear_error (&_inner_error_);
 #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 5938 "PiwigoPublishing.c"
+#line 6330 "PiwigoPublishing.c"
 		}
 #line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp9_ = doc;
+		_tmp6_ = doc;
 #line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp10_ = publishing_rest_support_xml_document_get_root_node (_tmp9_);
+		_tmp7_ = publishing_rest_support_xml_document_get_root_node (_tmp6_);
 #line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		rsp = _tmp10_;
+		rsp = _tmp7_;
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp12_ = doc;
+		_tmp9_ = doc;
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp13_ = rsp;
+		_tmp10_ = rsp;
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp14_ = publishing_rest_support_xml_document_get_named_child (_tmp12_, _tmp13_, "id", &_inner_error_);
+		_tmp11_ = publishing_rest_support_xml_document_get_named_child (_tmp9_, _tmp10_, "id", &_inner_error_);
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp11_ = _tmp14_;
+		_tmp8_ = _tmp11_;
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (doc);
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5960 "PiwigoPublishing.c"
-				goto __catch34_spit_publishing_publishing_error;
+#line 6352 "PiwigoPublishing.c"
+				goto __catch39_spit_publishing_publishing_error;
 			}
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (doc);
@@ -5976,45 +6368,43 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish
 			g_clear_error (&_inner_error_);
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 5971 "PiwigoPublishing.c"
+#line 6363 "PiwigoPublishing.c"
 		}
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		id_node = _tmp11_;
+		id_node = _tmp8_;
 #line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp15_ = id_node;
+		_tmp12_ = id_node;
 #line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp16_ = (gchar*) xmlNodeGetContent (_tmp15_);
+		_tmp13_ = (gchar*) xmlNodeGetContent (_tmp12_);
 #line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		id_string = _tmp16_;
+		id_string = _tmp13_;
 #line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp17_ = id_string;
+		_tmp14_ = id_string;
 #line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp18_ = atoi (_tmp17_);
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		id = _tmp18_;
+		id = atoi (_tmp14_);
 #line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp19_ = self->priv->parameters;
+		_tmp15_ = self->priv->parameters;
 #line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp20_ = _tmp19_->category;
+		_tmp16_ = _tmp15_->category;
 #line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp21_ = id;
+		_tmp17_ = id;
 #line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp20_->id = _tmp21_;
+		_tmp16_->id = _tmp17_;
 #line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp22_ = self->priv->strip_metadata;
+		_tmp18_ = self->priv->strip_metadata;
 #line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		publishing_piwigo_piwigo_publisher_do_upload (self, _tmp22_);
+		publishing_piwigo_piwigo_publisher_do_upload (self, _tmp18_);
 #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (id_string);
 #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (doc);
-#line 6003 "PiwigoPublishing.c"
+#line 6393 "PiwigoPublishing.c"
 	}
-	goto __finally34;
-	__catch34_spit_publishing_publishing_error:
+	goto __finally39;
+	__catch39_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		GError* _tmp23_;
+		GError* _tmp19_;
 #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		err = _inner_error_;
 #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6022,14 +6412,14 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish
 #line 813 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_debug ("PiwigoPublishing.vala:813: ERROR: on_category_add_complete");
 #line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp23_ = err;
+		_tmp19_ = err;
 #line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp23_);
+		publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp19_);
 #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_error_free0 (err);
-#line 6022 "PiwigoPublishing.c"
+#line 6412 "PiwigoPublishing.c"
 	}
-	__finally34:
+	__finally39:
 #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"
@@ -6038,7 +6428,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish
 		g_clear_error (&_inner_error_);
 #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 6033 "PiwigoPublishing.c"
+#line 6423 "PiwigoPublishing.c"
 	}
 }
 
@@ -6046,13 +6436,13 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish
 /**
      * Event triggered when the add category action fails due to a network error.
      */
-static void publishing_piwigo_piwigo_publisher_on_category_add_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_;
+static void
+publishing_piwigo_piwigo_publisher_on_category_add_error (PublishingPiwigoPiwigoPublisher* self,
+                                                          PublishingRESTSupportTransaction* bad_txn,
+                                                          GError* err)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	PublishingRESTSupportTransaction* _tmp4_;
-	GError* _tmp5_;
 #line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6060,150 +6450,151 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_error (Publishing
 #line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_debug ("PiwigoPublishing.vala:825: EVENT: on_category_add_error");
 #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = bad_txn;
-#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
 #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_complete_publishing_rest_support_transaction_completed, self);
+	g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_complete_publishing_rest_support_transaction_completed, self);
 #line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = bad_txn;
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
 #line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_error_publishing_rest_support_transaction_network_error, self);
-#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp4_ = bad_txn;
+	g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_error_publishing_rest_support_transaction_network_error, self);
 #line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp5_ = err;
-#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	publishing_piwigo_piwigo_publisher_on_network_error (self, _tmp4_, _tmp5_);
-#line 6072 "PiwigoPublishing.c"
+	publishing_piwigo_piwigo_publisher_on_network_error (self, bad_txn, err);
+#line 6454 "PiwigoPublishing.c"
 }
 
 
 /**
      * Upload action: the big one, the one we've been waiting for!
      */
-static void _publishing_piwigo_piwigo_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) {
+static void
+_publishing_piwigo_piwigo_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender,
+                                                                                                               gint num_photos_published,
+                                                                                                               gpointer self)
+{
 #line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_upload_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender, num_photos_published);
-#line 6082 "PiwigoPublishing.c"
+#line 6468 "PiwigoPublishing.c"
 }
 
 
-static void _publishing_piwigo_piwigo_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) {
+static void
+_publishing_piwigo_piwigo_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender,
+                                                                                                         GError* err,
+                                                                                                         gpointer self)
+{
 #line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_upload_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err);
-#line 6089 "PiwigoPublishing.c"
+#line 6479 "PiwigoPublishing.c"
 }
 
 
-static void _publishing_piwigo_piwigo_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
+static void
+_publishing_piwigo_piwigo_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number,
+                                                                                                gdouble fraction_complete,
+                                                                                                gpointer self)
+{
 #line 853 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_upload_status_updated ((PublishingPiwigoPiwigoPublisher*) self, file_number, fraction_complete);
-#line 6096 "PiwigoPublishing.c"
+#line 6490 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_piwigo_publisher_do_upload (PublishingPiwigoPiwigoPublisher* self, gboolean strip_metadata) {
-	gboolean _tmp0_;
-	SpitPublishingPluginHost* _tmp1_;
-	PublishingPiwigoPublishingParameters* _tmp2_;
-	PublishingPiwigoCategory* _tmp3_;
-	gint _tmp4_;
-	PublishingPiwigoPublishingParameters* _tmp5_;
-	PublishingPiwigoPermissionLevel* _tmp6_;
-	gint _tmp7_;
-	PublishingPiwigoPublishingParameters* _tmp8_;
-	PublishingPiwigoSizeEntry* _tmp9_;
-	gint _tmp10_;
-	PublishingPiwigoPublishingParameters* _tmp11_;
-	gboolean _tmp12_;
-	PublishingPiwigoPublishingParameters* _tmp13_;
-	gboolean _tmp14_;
-	gboolean _tmp15_;
-	SpitPublishingPluginHost* _tmp16_;
-	PublishingPiwigoPublishingParameters* _tmp17_;
-	PublishingPiwigoSizeEntry* _tmp18_;
-	gint _tmp19_;
-	gboolean _tmp20_;
-	void* _tmp21_;
-	GDestroyNotify _tmp22_;
-	SpitPublishingProgressCallback _tmp23_;
+static void
+publishing_piwigo_piwigo_publisher_do_upload (PublishingPiwigoPiwigoPublisher* self,
+                                              gboolean strip_metadata)
+{
+	SpitPublishingPluginHost* _tmp0_;
+	PublishingPiwigoPublishingParameters* _tmp1_;
+	PublishingPiwigoCategory* _tmp2_;
+	gint _tmp3_;
+	PublishingPiwigoPublishingParameters* _tmp4_;
+	PublishingPiwigoPermissionLevel* _tmp5_;
+	gint _tmp6_;
+	PublishingPiwigoPublishingParameters* _tmp7_;
+	PublishingPiwigoSizeEntry* _tmp8_;
+	gint _tmp9_;
+	PublishingPiwigoPublishingParameters* _tmp10_;
+	gboolean _tmp11_;
+	PublishingPiwigoPublishingParameters* _tmp12_;
+	gboolean _tmp13_;
+	SpitPublishingPluginHost* _tmp14_;
+	PublishingPiwigoPublishingParameters* _tmp15_;
+	PublishingPiwigoSizeEntry* _tmp16_;
+	gint _tmp17_;
+	gboolean _tmp18_;
+	void* _tmp19_;
+	GDestroyNotify _tmp20_;
+	SpitPublishingProgressCallback _tmp21_;
 	SpitPublishingPublishable** publishables = NULL;
-	SpitPublishingPluginHost* _tmp24_;
-	gint _tmp25_;
-	SpitPublishingPublishable** _tmp26_;
+	SpitPublishingPluginHost* _tmp22_;
+	gint _tmp23_;
+	SpitPublishingPublishable** _tmp24_;
 	gint publishables_length1;
 	gint _publishables_size_;
 	PublishingPiwigoUploader* uploader = NULL;
-	PublishingPiwigoSession* _tmp27_;
-	PublishingPiwigoPublishingParameters* _tmp28_;
-	PublishingPiwigoUploader* _tmp29_;
+	PublishingPiwigoSession* _tmp25_;
+	PublishingPiwigoPublishingParameters* _tmp26_;
+	PublishingPiwigoUploader* _tmp27_;
 #line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = strip_metadata;
-#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->strip_metadata = _tmp0_;
+	self->priv->strip_metadata = strip_metadata;
 #line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_debug ("PiwigoPublishing.vala:836: ACTION: uploading pictures");
 #line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = self->priv->host;
+	_tmp0_ = self->priv->host;
 #line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp1_, TRUE);
+	spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
 #line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = self->priv->parameters;
+	_tmp1_ = self->priv->parameters;
 #line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp3_ = _tmp2_->category;
+	_tmp2_ = _tmp1_->category;
 #line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp4_ = _tmp3_->id;
+	_tmp3_ = _tmp2_->id;
 #line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	publishing_piwigo_piwigo_publisher_set_last_category (self, _tmp4_);
+	publishing_piwigo_piwigo_publisher_set_last_category (self, _tmp3_);
 #line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp5_ = self->priv->parameters;
+	_tmp4_ = self->priv->parameters;
 #line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp6_ = _tmp5_->perm_level;
+	_tmp5_ = _tmp4_->perm_level;
 #line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp7_ = _tmp6_->id;
+	_tmp6_ = _tmp5_->id;
 #line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	publishing_piwigo_piwigo_publisher_set_last_permission_level (self, _tmp7_);
+	publishing_piwigo_piwigo_publisher_set_last_permission_level (self, _tmp6_);
 #line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp8_ = self->priv->parameters;
+	_tmp7_ = self->priv->parameters;
 #line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp9_ = _tmp8_->photo_size;
+	_tmp8_ = _tmp7_->photo_size;
 #line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp10_ = _tmp9_->id;
+	_tmp9_ = _tmp8_->id;
 #line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	publishing_piwigo_piwigo_publisher_set_last_photo_size (self, _tmp10_);
+	publishing_piwigo_piwigo_publisher_set_last_photo_size (self, _tmp9_);
 #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp11_ = self->priv->parameters;
+	_tmp10_ = self->priv->parameters;
 #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp12_ = _tmp11_->title_as_comment;
+	_tmp11_ = _tmp10_->title_as_comment;
 #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	publishing_piwigo_piwigo_publisher_set_last_title_as_comment (self, _tmp12_);
+	publishing_piwigo_piwigo_publisher_set_last_title_as_comment (self, _tmp11_);
 #line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp13_ = self->priv->parameters;
+	_tmp12_ = self->priv->parameters;
 #line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp14_ = _tmp13_->no_upload_tags;
+	_tmp13_ = _tmp12_->no_upload_tags;
 #line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	publishing_piwigo_piwigo_publisher_set_last_no_upload_tags (self, _tmp14_);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp15_ = strip_metadata;
+	publishing_piwigo_piwigo_publisher_set_last_no_upload_tags (self, _tmp13_);
 #line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	publishing_piwigo_piwigo_publisher_set_metadata_removal_choice (self, _tmp15_);
+	publishing_piwigo_piwigo_publisher_set_metadata_removal_choice (self, strip_metadata);
 #line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp16_ = self->priv->host;
+	_tmp14_ = self->priv->host;
 #line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp17_ = self->priv->parameters;
+	_tmp15_ = self->priv->parameters;
 #line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp18_ = _tmp17_->photo_size;
+	_tmp16_ = _tmp15_->photo_size;
 #line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp19_ = _tmp18_->id;
+	_tmp17_ = _tmp16_->id;
 #line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp20_ = self->priv->strip_metadata;
+	_tmp18_ = self->priv->strip_metadata;
 #line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp23_ = spit_publishing_plugin_host_serialize_publishables (_tmp16_, _tmp19_, _tmp20_, &_tmp21_, &_tmp22_);
+	_tmp21_ = spit_publishing_plugin_host_serialize_publishables (_tmp14_, _tmp17_, _tmp18_, &_tmp19_, &_tmp20_);
 #line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
 #line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6213,29 +6604,29 @@ static void publishing_piwigo_piwigo_publisher_do_upload (PublishingPiwigoPiwigo
 #line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = NULL;
 #line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->progress_reporter = _tmp23_;
+	self->priv->progress_reporter = _tmp21_;
 #line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->progress_reporter_target = _tmp21_;
+	self->priv->progress_reporter_target = _tmp19_;
 #line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->progress_reporter_target_destroy_notify = _tmp22_;
+	self->priv->progress_reporter_target_destroy_notify = _tmp20_;
 #line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp24_ = self->priv->host;
+	_tmp22_ = self->priv->host;
 #line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp26_ = spit_publishing_plugin_host_get_publishables (_tmp24_, &_tmp25_);
+	_tmp24_ = spit_publishing_plugin_host_get_publishables (_tmp22_, &_tmp23_);
 #line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	publishables = _tmp26_;
+	publishables = _tmp24_;
 #line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	publishables_length1 = _tmp25_;
+	publishables_length1 = _tmp23_;
 #line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishables_size_ = publishables_length1;
 #line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp27_ = self->priv->session;
+	_tmp25_ = self->priv->session;
 #line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp28_ = self->priv->parameters;
+	_tmp26_ = self->priv->parameters;
 #line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp29_ = publishing_piwigo_uploader_new (_tmp27_, publishables, publishables_length1, _tmp28_);
+	_tmp27_ = publishing_piwigo_uploader_new (_tmp25_, publishables, publishables_length1, _tmp26_);
 #line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	uploader = _tmp29_;
+	uploader = _tmp27_;
 #line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (uploader, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-complete", (GCallback) _publishing_piwigo_piwigo_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self, 0);
 #line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6246,7 +6637,7 @@ static void publishing_piwigo_piwigo_publisher_do_upload (PublishingPiwigoPiwigo
 	_publishing_rest_support_batch_uploader_unref0 (uploader);
 #line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 6241 "PiwigoPublishing.c"
+#line 6632 "PiwigoPublishing.c"
 }
 
 
@@ -6254,11 +6645,13 @@ static void publishing_piwigo_piwigo_publisher_do_upload (PublishingPiwigoPiwigo
      * Event triggered when the batch uploader reports that at least one of the
      * network transactions encapsulating uploads has completed successfully
      */
-static void publishing_piwigo_piwigo_publisher_on_upload_complete (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published) {
-	PublishingRESTSupportBatchUploader* _tmp0_;
+static void
+publishing_piwigo_piwigo_publisher_on_upload_complete (PublishingPiwigoPiwigoPublisher* self,
+                                                       PublishingRESTSupportBatchUploader* uploader,
+                                                       gint num_published)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportBatchUploader* _tmp2_;
-	guint _tmp3_;
 #line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6266,20 +6659,16 @@ static void publishing_piwigo_piwigo_publisher_on_upload_complete (PublishingPiw
 #line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_debug ("PiwigoPublishing.vala:861: EVENT: on_upload_complete");
 #line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = uploader;
+	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp0_, NULL, FALSE);
 #line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
-#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
-#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = uploader;
+	g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
 #line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
+	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
 #line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
+	g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
 #line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_do_show_success_pane (self);
-#line 6274 "PiwigoPublishing.c"
+#line 6663 "PiwigoPublishing.c"
 }
 
 
@@ -6287,12 +6676,13 @@ static void publishing_piwigo_piwigo_publisher_on_upload_complete (PublishingPiw
      * Event triggered when the batch uploader reports that at least one of the
      * network transactions encapsulating uploads has caused a network error
      */
-static void publishing_piwigo_piwigo_publisher_on_upload_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err) {
-	PublishingRESTSupportBatchUploader* _tmp0_;
+static void
+publishing_piwigo_piwigo_publisher_on_upload_error (PublishingPiwigoPiwigoPublisher* self,
+                                                    PublishingRESTSupportBatchUploader* uploader,
+                                                    GError* err)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportBatchUploader* _tmp2_;
-	guint _tmp3_;
-	GError* _tmp4_;
 #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6300,76 +6690,64 @@ static void publishing_piwigo_piwigo_publisher_on_upload_error (PublishingPiwigo
 #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_debug ("PiwigoPublishing.vala:878: EVENT: on_upload_error");
 #line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = uploader;
-#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
+	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp0_, NULL, FALSE);
 #line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
+	g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
 #line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = uploader;
+	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
 #line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
-#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp4_ = err;
+	g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
 #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp4_);
-#line 6310 "PiwigoPublishing.c"
+	publishing_piwigo_piwigo_publisher_do_show_error (self, err);
+#line 6694 "PiwigoPublishing.c"
 }
 
 
 /**
      * Event triggered when upload progresses and the status needs to be updated.
      */
-static void publishing_piwigo_piwigo_publisher_on_upload_status_updated (PublishingPiwigoPiwigoPublisher* self, gint file_number, gdouble completed_fraction) {
-	gboolean _tmp0_;
-	gdouble _tmp1_;
-	SpitPublishingProgressCallback _tmp2_;
-	void* _tmp2__target;
-	SpitPublishingProgressCallback _tmp3_;
-	void* _tmp3__target;
-	gint _tmp4_;
-	gdouble _tmp5_;
+static void
+publishing_piwigo_piwigo_publisher_on_upload_status_updated (PublishingPiwigoPiwigoPublisher* self,
+                                                             gint file_number,
+                                                             gdouble completed_fraction)
+{
+	SpitPublishingProgressCallback _tmp0_;
+	void* _tmp0__target;
+	SpitPublishingProgressCallback _tmp1_;
+	void* _tmp1__target;
 #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (!_tmp0_) {
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
 #line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 6334 "PiwigoPublishing.c"
+#line 6716 "PiwigoPublishing.c"
 	}
 #line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = completed_fraction;
-#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_debug ("PiwigoPublishing.vala:892: EVENT: uploader reports upload %.2f percent" \
-" complete.", 100.0 * _tmp1_);
+" complete.", 100.0 * completed_fraction);
 #line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = self->priv->progress_reporter;
+	_tmp0_ = self->priv->progress_reporter;
 #line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2__target = self->priv->progress_reporter_target;
+	_tmp0__target = self->priv->progress_reporter_target;
 #line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_assert (_tmp2_ != NULL, "progress_reporter != null");
+	_vala_assert (_tmp0_ != NULL, "progress_reporter != null");
 #line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp3_ = self->priv->progress_reporter;
+	_tmp1_ = self->priv->progress_reporter;
 #line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp3__target = self->priv->progress_reporter_target;
+	_tmp1__target = self->priv->progress_reporter_target;
 #line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp4_ = file_number;
-#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp5_ = completed_fraction;
-#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 6356 "PiwigoPublishing.c"
+	_tmp1_ (file_number, completed_fraction, _tmp1__target);
+#line 6732 "PiwigoPublishing.c"
 }
 
 
 /**
      * Action to display the success pane in the publishing dialog.
      */
-static void publishing_piwigo_piwigo_publisher_do_show_success_pane (PublishingPiwigoPiwigoPublisher* self) {
+static void
+publishing_piwigo_piwigo_publisher_do_show_success_pane (PublishingPiwigoPiwigoPublisher* self)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	SpitPublishingPluginHost* _tmp1_;
 #line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6384,15 +6762,18 @@ static void publishing_piwigo_piwigo_publisher_do_show_success_pane (PublishingP
 	_tmp1_ = self->priv->host;
 #line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_install_success_pane (_tmp1_);
-#line 6378 "PiwigoPublishing.c"
+#line 6756 "PiwigoPublishing.c"
 }
 
 
 /**
      * Helper event to handle network errors.
      */
-static void publishing_piwigo_piwigo_publisher_on_network_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
-	GError* _tmp0_;
+static void
+publishing_piwigo_piwigo_publisher_on_network_error (PublishingPiwigoPiwigoPublisher* self,
+                                                     PublishingRESTSupportTransaction* bad_txn,
+                                                     GError* err)
+{
 #line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6400,25 +6781,24 @@ static void publishing_piwigo_piwigo_publisher_on_network_error (PublishingPiwig
 #line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_debug ("PiwigoPublishing.vala:916: EVENT: on_network_error");
 #line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = err;
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp0_);
-#line 6397 "PiwigoPublishing.c"
+	publishing_piwigo_piwigo_publisher_do_show_error (self, err);
+#line 6776 "PiwigoPublishing.c"
 }
 
 
 /**
      * Action to display an error to the user.
      */
-static void publishing_piwigo_piwigo_publisher_do_show_error (PublishingPiwigoPiwigoPublisher* self, GError* e) {
+static void
+publishing_piwigo_piwigo_publisher_do_show_error (PublishingPiwigoPiwigoPublisher* self,
+                                                  GError* e)
+{
 	gchar* error_type = NULL;
 	gchar* _tmp0_;
-	GError* _tmp1_;
-	const gchar* _tmp16_;
-	GError* _tmp17_;
-	const gchar* _tmp18_;
-	gchar* _tmp19_;
-	gchar* _tmp20_;
+	const gchar* _tmp8_;
+	const gchar* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
 #line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 924 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6428,121 +6808,98 @@ static void publishing_piwigo_piwigo_publisher_do_show_error (PublishingPiwigoPi
 #line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	error_type = _tmp0_;
 #line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = e;
-#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (g_error_matches (_tmp1_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER)) {
+	if (g_error_matches (e, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER)) {
 #line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_piwigo_publisher_do_show_authentication_pane (self, PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_URL);
 #line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (error_type);
 #line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 6431 "PiwigoPublishing.c"
+#line 6809 "PiwigoPublishing.c"
 	} else {
-		GError* _tmp2_;
-#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp2_ = e;
 #line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		if (g_error_matches (_tmp2_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_COMMUNICATION_FAILED)) {
-#line 6438 "PiwigoPublishing.c"
-			gchar* _tmp3_;
+		if (g_error_matches (e, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_COMMUNICATION_FAILED)) {
+#line 6813 "PiwigoPublishing.c"
+			gchar* _tmp1_;
 #line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp3_ = g_strdup ("COMMUNICATION_FAILED");
+			_tmp1_ = g_strdup ("COMMUNICATION_FAILED");
 #line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_free0 (error_type);
 #line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			error_type = _tmp3_;
-#line 6446 "PiwigoPublishing.c"
+			error_type = _tmp1_;
+#line 6821 "PiwigoPublishing.c"
 		} else {
-			GError* _tmp4_;
 #line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp4_ = e;
-#line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			if (g_error_matches (_tmp4_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_PROTOCOL_ERROR)) {
-#line 6453 "PiwigoPublishing.c"
-				gchar* _tmp5_;
+			if (g_error_matches (e, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_PROTOCOL_ERROR)) {
+#line 6825 "PiwigoPublishing.c"
+				gchar* _tmp2_;
 #line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp5_ = g_strdup ("PROTOCOL_ERROR");
+				_tmp2_ = g_strdup ("PROTOCOL_ERROR");
 #line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_free0 (error_type);
 #line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				error_type = _tmp5_;
-#line 6461 "PiwigoPublishing.c"
+				error_type = _tmp2_;
+#line 6833 "PiwigoPublishing.c"
 			} else {
-				GError* _tmp6_;
-#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp6_ = e;
 #line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				if (g_error_matches (_tmp6_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SERVICE_ERROR)) {
-#line 6468 "PiwigoPublishing.c"
-					gchar* _tmp7_;
+				if (g_error_matches (e, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SERVICE_ERROR)) {
+#line 6837 "PiwigoPublishing.c"
+					gchar* _tmp3_;
 #line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp7_ = g_strdup ("SERVICE_ERROR");
+					_tmp3_ = g_strdup ("SERVICE_ERROR");
 #line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_free0 (error_type);
 #line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					error_type = _tmp7_;
-#line 6476 "PiwigoPublishing.c"
+					error_type = _tmp3_;
+#line 6845 "PiwigoPublishing.c"
 				} else {
-					GError* _tmp8_;
-#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp8_ = e;
 #line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					if (g_error_matches (_tmp8_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE)) {
-#line 6483 "PiwigoPublishing.c"
-						gchar* _tmp9_;
+					if (g_error_matches (e, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE)) {
+#line 6849 "PiwigoPublishing.c"
+						gchar* _tmp4_;
 #line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-						_tmp9_ = g_strdup ("MALFORMED_RESPONSE");
+						_tmp4_ = g_strdup ("MALFORMED_RESPONSE");
 #line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						_g_free0 (error_type);
 #line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-						error_type = _tmp9_;
-#line 6491 "PiwigoPublishing.c"
+						error_type = _tmp4_;
+#line 6857 "PiwigoPublishing.c"
 					} else {
-						GError* _tmp10_;
-#line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-						_tmp10_ = e;
 #line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-						if (g_error_matches (_tmp10_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR)) {
-#line 6498 "PiwigoPublishing.c"
-							gchar* _tmp11_;
+						if (g_error_matches (e, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR)) {
+#line 6861 "PiwigoPublishing.c"
+							gchar* _tmp5_;
 #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-							_tmp11_ = g_strdup ("LOCAL_FILE_ERROR");
+							_tmp5_ = g_strdup ("LOCAL_FILE_ERROR");
 #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 							_g_free0 (error_type);
 #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-							error_type = _tmp11_;
-#line 6506 "PiwigoPublishing.c"
+							error_type = _tmp5_;
+#line 6869 "PiwigoPublishing.c"
 						} else {
-							GError* _tmp12_;
 #line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-							_tmp12_ = e;
-#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-							if (g_error_matches (_tmp12_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_EXPIRED_SESSION)) {
-#line 6513 "PiwigoPublishing.c"
-								gchar* _tmp13_;
+							if (g_error_matches (e, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_EXPIRED_SESSION)) {
+#line 6873 "PiwigoPublishing.c"
+								gchar* _tmp6_;
 #line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-								_tmp13_ = g_strdup ("EXPIRED_SESSION");
+								_tmp6_ = g_strdup ("EXPIRED_SESSION");
 #line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 								_g_free0 (error_type);
 #line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-								error_type = _tmp13_;
-#line 6521 "PiwigoPublishing.c"
+								error_type = _tmp6_;
+#line 6881 "PiwigoPublishing.c"
 							} else {
-								GError* _tmp14_;
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-								_tmp14_ = e;
 #line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-								if (g_error_matches (_tmp14_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SSL_FAILED)) {
-#line 6528 "PiwigoPublishing.c"
-									gchar* _tmp15_;
+								if (g_error_matches (e, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SSL_FAILED)) {
+#line 6885 "PiwigoPublishing.c"
+									gchar* _tmp7_;
 #line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-									_tmp15_ = g_strdup ("SECURE_CONNECTION_FAILED");
+									_tmp7_ = g_strdup ("SECURE_CONNECTION_FAILED");
 #line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 									_g_free0 (error_type);
 #line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-									error_type = _tmp15_;
-#line 6536 "PiwigoPublishing.c"
+									error_type = _tmp7_;
+#line 6893 "PiwigoPublishing.c"
 								}
 							}
 						}
@@ -6552,33 +6909,33 @@ static void publishing_piwigo_piwigo_publisher_do_show_error (PublishingPiwigoPi
 		}
 	}
 #line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp16_ = error_type;
+	_tmp8_ = error_type;
 #line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp17_ = e;
+	_tmp9_ = e->message;
 #line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp18_ = _tmp17_->message;
+	_tmp10_ = g_strdup_printf ("Unhandled error: type=%s; message='%s'", _tmp8_, _tmp9_);
 #line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp19_ = g_strdup_printf ("Unhandled error: type=%s; message='%s'", _tmp16_, _tmp18_);
-#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp20_ = _tmp19_;
+	_tmp11_ = _tmp10_;
 #line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:945: %s", _tmp20_);
+	g_debug ("PiwigoPublishing.vala:945: %s", _tmp11_);
 #line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_free0 (_tmp20_);
+	_g_free0 (_tmp11_);
 #line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_do_show_error_message (self, _ ("An error message occurred when publishing to Piwigo. Please try again."));
 #line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (error_type);
-#line 6563 "PiwigoPublishing.c"
+#line 6918 "PiwigoPublishing.c"
 }
 
 
 /**
      * Action to display an error message to the user.
      */
-static void publishing_piwigo_piwigo_publisher_do_show_error_message (PublishingPiwigoPiwigoPublisher* self, const gchar* message) {
+static void
+publishing_piwigo_piwigo_publisher_do_show_error_message (PublishingPiwigoPiwigoPublisher* self,
+                                                          const gchar* message)
+{
 	SpitPublishingPluginHost* _tmp0_;
-	const gchar* _tmp1_;
 #line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
 #line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6588,10 +6945,8 @@ static void publishing_piwigo_piwigo_publisher_do_show_error_message (Publishing
 #line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
 #line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = message;
-#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	spit_publishing_plugin_host_install_static_message_pane (_tmp0_, _tmp1_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
-#line 6585 "PiwigoPublishing.c"
+	spit_publishing_plugin_host_install_static_message_pane (_tmp0_, message, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
+#line 6940 "PiwigoPublishing.c"
 }
 
 
@@ -6604,51 +6959,61 @@ static void publishing_piwigo_piwigo_publisher_do_show_error_message (Publishing
      * @param txn the received transaction
      * @return the value of pwg_id if present or null if not found
      */
-static SoupCookie* _vala_SoupCookie_copy (SoupCookie* self) {
+static SoupCookie*
+_vala_SoupCookie_copy (SoupCookie* self)
+{
 #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return g_boxed_copy (soup_cookie_get_type (), self);
-#line 6601 "PiwigoPublishing.c"
+#line 6958 "PiwigoPublishing.c"
 }
 
 
-static gpointer __vala_SoupCookie_copy0 (gpointer self) {
+static gpointer
+__vala_SoupCookie_copy0 (gpointer self)
+{
 #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self ? _vala_SoupCookie_copy (self) : NULL;
-#line 6608 "PiwigoPublishing.c"
+#line 6967 "PiwigoPublishing.c"
 }
 
 
-static void _vala_SoupCookie_free (SoupCookie* self) {
+static void
+_vala_SoupCookie_free (SoupCookie* self)
+{
 #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_boxed_free (soup_cookie_get_type (), self);
-#line 6615 "PiwigoPublishing.c"
+#line 6976 "PiwigoPublishing.c"
 }
 
 
-static void __vala_SoupCookie_free0_ (gpointer var) {
+static void
+__vala_SoupCookie_free0_ (gpointer var)
+{
 #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(var == NULL) ? NULL : (var = (_vala_SoupCookie_free (var), NULL));
-#line 6622 "PiwigoPublishing.c"
+#line 6985 "PiwigoPublishing.c"
 }
 
 
-static void _g_slist_free___vala_SoupCookie_free0_ (GSList* self) {
-#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_slist_foreach (self, (GFunc) __vala_SoupCookie_free0_, NULL);
+static inline void
+_g_slist_free___vala_SoupCookie_free0_ (GSList* self)
+{
 #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_slist_free (self);
-#line 6631 "PiwigoPublishing.c"
+	g_slist_free_full (self, (GDestroyNotify) __vala_SoupCookie_free0_);
+#line 6994 "PiwigoPublishing.c"
 }
 
 
-static gchar* publishing_piwigo_piwigo_publisher_get_pwg_id_from_transaction (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* txn) {
+static gchar*
+publishing_piwigo_piwigo_publisher_get_pwg_id_from_transaction (PublishingPiwigoPiwigoPublisher* self,
+                                                                PublishingRESTSupportTransaction* txn)
+{
 	gchar* result = NULL;
 	gchar* pwg_id = NULL;
-	PublishingRESTSupportTransaction* _tmp0_;
+	SoupMessage* _tmp0_;
 	SoupMessage* _tmp1_;
-	SoupMessage* _tmp2_;
+	GSList* _tmp2_;
 	GSList* _tmp3_;
-	GSList* _tmp4_;
 #line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), NULL);
 #line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6656,92 +7021,94 @@ static gchar* publishing_piwigo_piwigo_publisher_get_pwg_id_from_transaction (Pu
 #line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	pwg_id = NULL;
 #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = txn;
+	_tmp0_ = publishing_rest_support_transaction_get_message (txn);
 #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = publishing_rest_support_transaction_get_message (_tmp0_);
-#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp3_ = soup_cookies_from_response (_tmp2_);
+	_tmp2_ = soup_cookies_from_response (_tmp1_);
 #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp4_ = _tmp3_;
+	_tmp3_ = _tmp2_;
 #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_object_unref0 (_tmp2_);
-#line 6661 "PiwigoPublishing.c"
+	_g_object_unref0 (_tmp1_);
+#line 7024 "PiwigoPublishing.c"
 	{
 		GSList* cookie_collection = NULL;
 		GSList* cookie_it = NULL;
 #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		cookie_collection = _tmp4_;
+		cookie_collection = _tmp3_;
 #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		for (cookie_it = cookie_collection; cookie_it != NULL; cookie_it = cookie_it->next) {
-#line 6669 "PiwigoPublishing.c"
-			SoupCookie* _tmp5_;
+#line 7032 "PiwigoPublishing.c"
+			SoupCookie* _tmp4_;
 			SoupCookie* cookie = NULL;
 #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp5_ = __vala_SoupCookie_copy0 ((SoupCookie*) cookie_it->data);
+			_tmp4_ = __vala_SoupCookie_copy0 ((SoupCookie*) cookie_it->data);
 #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			cookie = _tmp5_;
-#line 6676 "PiwigoPublishing.c"
+			cookie = _tmp4_;
+#line 7039 "PiwigoPublishing.c"
 			{
-				SoupCookie* _tmp6_;
-				const gchar* _tmp7_;
+				SoupCookie* _tmp5_;
+				const gchar* _tmp6_;
 #line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp6_ = cookie;
+				_tmp5_ = cookie;
 #line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp7_ = soup_cookie_get_name (_tmp6_);
+				_tmp6_ = soup_cookie_get_name (_tmp5_);
 #line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				if (g_strcmp0 (_tmp7_, "pwg_id") == 0) {
-#line 6686 "PiwigoPublishing.c"
-					SoupCookie* _tmp8_;
-					const gchar* _tmp9_;
-					gchar* _tmp10_;
-					const gchar* _tmp11_;
+				if (g_strcmp0 (_tmp6_, "pwg_id") == 0) {
+#line 7049 "PiwigoPublishing.c"
+					SoupCookie* _tmp7_;
+					const gchar* _tmp8_;
+					gchar* _tmp9_;
+					const gchar* _tmp10_;
 #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp8_ = cookie;
+					_tmp7_ = cookie;
 #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp9_ = soup_cookie_get_value (_tmp8_);
+					_tmp8_ = soup_cookie_get_value (_tmp7_);
 #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp10_ = g_strdup (_tmp9_);
+					_tmp9_ = g_strdup (_tmp8_);
 #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_free0 (pwg_id);
 #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					pwg_id = _tmp10_;
+					pwg_id = _tmp9_;
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp11_ = pwg_id;
+					_tmp10_ = pwg_id;
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					g_debug ("PiwigoPublishing.vala:977: Found pwg_id %s", _tmp11_);
-#line 6705 "PiwigoPublishing.c"
+					g_debug ("PiwigoPublishing.vala:977: Found pwg_id %s", _tmp10_);
+#line 7068 "PiwigoPublishing.c"
 				}
 #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				__vala_SoupCookie_free0 (cookie);
-#line 6709 "PiwigoPublishing.c"
+#line 7072 "PiwigoPublishing.c"
 			}
 		}
 #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		__g_slist_free___vala_SoupCookie_free0_0 (cookie_collection);
-#line 6714 "PiwigoPublishing.c"
+#line 7077 "PiwigoPublishing.c"
 	}
 #line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = pwg_id;
 #line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 6720 "PiwigoPublishing.c"
+#line 7083 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_piwigo_publisher_class_init (PublishingPiwigoPiwigoPublisherClass * klass) {
+static void
+publishing_piwigo_piwigo_publisher_class_init (PublishingPiwigoPiwigoPublisherClass * klass)
+{
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_parent_class = g_type_class_peek_parent (klass);
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingPiwigoPiwigoPublisherPrivate));
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_piwigo_piwigo_publisher_finalize;
-#line 6731 "PiwigoPublishing.c"
+#line 7096 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_piwigo_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface) {
+static void
+publishing_piwigo_piwigo_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface)
+{
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface);
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6752,11 +7119,13 @@ static void publishing_piwigo_piwigo_publisher_spit_publishing_publisher_interfa
 	iface->start = (void (*) (SpitPublishingPublisher *)) publishing_piwigo_piwigo_publisher_real_start;
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_piwigo_piwigo_publisher_real_stop;
-#line 6746 "PiwigoPublishing.c"
+#line 7113 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_piwigo_publisher_instance_init (PublishingPiwigoPiwigoPublisher * self) {
+static void
+publishing_piwigo_piwigo_publisher_instance_init (PublishingPiwigoPiwigoPublisher * self)
+{
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv = PUBLISHING_PIWIGO_PIWIGO_PUBLISHER_GET_PRIVATE (self);
 #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6777,11 +7146,13 @@ static void publishing_piwigo_piwigo_publisher_instance_init (PublishingPiwigoPi
 	self->priv->progress_reporter_target = self;
 #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 6771 "PiwigoPublishing.c"
+#line 7140 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_piwigo_publisher_finalize (GObject * obj) {
+static void
+publishing_piwigo_piwigo_publisher_finalize (GObject * obj)
+{
 	PublishingPiwigoPiwigoPublisher * self;
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, PublishingPiwigoPiwigoPublisher);
@@ -6805,11 +7176,13 @@ static void publishing_piwigo_piwigo_publisher_finalize (GObject * obj) {
 	self->priv->progress_reporter_target_destroy_notify = NULL;
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (publishing_piwigo_piwigo_publisher_parent_class)->finalize (obj);
-#line 6799 "PiwigoPublishing.c"
+#line 7170 "PiwigoPublishing.c"
 }
 
 
-GType publishing_piwigo_piwigo_publisher_get_type (void) {
+GType
+publishing_piwigo_piwigo_publisher_get_type (void)
+{
 	static volatile gsize publishing_piwigo_piwigo_publisher_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_piwigo_piwigo_publisher_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingPiwigoPiwigoPublisherClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_piwigo_piwigo_publisher_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPiwigoPiwigoPublisher), 0, (GInstanceInitFunc) publishing_piwigo_piwigo_publisher_instance_init, NULL };
@@ -6823,55 +7196,56 @@ GType publishing_piwigo_piwigo_publisher_get_type (void) {
 }
 
 
-PublishingPiwigoUploader* publishing_piwigo_uploader_construct (GType object_type, PublishingPiwigoSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingPiwigoPublishingParameters* parameters) {
+PublishingPiwigoUploader*
+publishing_piwigo_uploader_construct (GType object_type,
+                                      PublishingPiwigoSession* session,
+                                      SpitPublishingPublishable** publishables,
+                                      int publishables_length1,
+                                      PublishingPiwigoPublishingParameters* parameters)
+{
 	PublishingPiwigoUploader* self = NULL;
-	PublishingPiwigoSession* _tmp0_;
-	SpitPublishingPublishable** _tmp1_;
-	gint _tmp1__length1;
-	PublishingPiwigoPublishingParameters* _tmp2_;
-	PublishingPiwigoPublishingParameters* _tmp3_;
+	PublishingPiwigoPublishingParameters* _tmp0_;
 #line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
 #line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_PARAMETERS (parameters), NULL);
 #line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = session;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = publishables;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1__length1 = publishables_length1;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self = (PublishingPiwigoUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp1__length1);
-#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = parameters;
+	self = (PublishingPiwigoUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), publishables, publishables_length1);
 #line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp3_ = _publishing_piwigo_publishing_parameters_ref0 (_tmp2_);
+	_tmp0_ = _publishing_piwigo_publishing_parameters_ref0 (parameters);
 #line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_piwigo_publishing_parameters_unref0 (self->priv->parameters);
 #line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->parameters = _tmp3_;
+	self->priv->parameters = _tmp0_;
 #line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 6846 "PiwigoPublishing.c"
+#line 7213 "PiwigoPublishing.c"
 }
 
 
-PublishingPiwigoUploader* publishing_piwigo_uploader_new (PublishingPiwigoSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingPiwigoPublishingParameters* parameters) {
+PublishingPiwigoUploader*
+publishing_piwigo_uploader_new (PublishingPiwigoSession* session,
+                                SpitPublishingPublishable** publishables,
+                                int publishables_length1,
+                                PublishingPiwigoPublishingParameters* parameters)
+{
 #line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_uploader_construct (PUBLISHING_PIWIGO_TYPE_UPLOADER, session, publishables, publishables_length1, parameters);
-#line 6853 "PiwigoPublishing.c"
+#line 7225 "PiwigoPublishing.c"
 }
 
 
-static PublishingRESTSupportTransaction* publishing_piwigo_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable) {
+static PublishingRESTSupportTransaction*
+publishing_piwigo_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base,
+                                                    SpitPublishingPublishable* publishable)
+{
 	PublishingPiwigoUploader * self;
 	PublishingRESTSupportTransaction* result = NULL;
 	PublishingRESTSupportSession* _tmp0_;
 	PublishingPiwigoSession* _tmp1_;
 	PublishingPiwigoPublishingParameters* _tmp2_;
-	SpitPublishingPublishable* _tmp3_;
-	PublishingPiwigoImagesAddTransaction* _tmp4_;
-	PublishingRESTSupportTransaction* _tmp5_;
+	PublishingPiwigoImagesAddTransaction* _tmp3_;
+	PublishingRESTSupportTransaction* _tmp4_;
 #line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_UPLOADER, PublishingPiwigoUploader);
 #line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6883,22 +7257,22 @@ static PublishingRESTSupportTransaction* publishing_piwigo_uploader_real_create_
 #line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = self->priv->parameters;
 #line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp3_ = publishable;
+	_tmp3_ = publishing_piwigo_images_add_transaction_new (_tmp1_, _tmp2_, publishable);
 #line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp4_ = publishing_piwigo_images_add_transaction_new (_tmp1_, _tmp2_, _tmp3_);
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
+	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
 #line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_rest_support_session_unref0 (_tmp1_);
 #line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	result = _tmp5_;
+	result = _tmp4_;
 #line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 6888 "PiwigoPublishing.c"
+#line 7260 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_uploader_class_init (PublishingPiwigoUploaderClass * klass) {
+static void
+publishing_piwigo_uploader_class_init (PublishingPiwigoUploaderClass * klass)
+{
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_uploader_parent_class = g_type_class_peek_parent (klass);
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -6907,18 +7281,22 @@ static void publishing_piwigo_uploader_class_init (PublishingPiwigoUploaderClass
 	g_type_class_add_private (klass, sizeof (PublishingPiwigoUploaderPrivate));
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_piwigo_uploader_real_create_transaction;
-#line 6901 "PiwigoPublishing.c"
+#line 7275 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_uploader_instance_init (PublishingPiwigoUploader * self) {
+static void
+publishing_piwigo_uploader_instance_init (PublishingPiwigoUploader * self)
+{
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv = PUBLISHING_PIWIGO_UPLOADER_GET_PRIVATE (self);
-#line 6908 "PiwigoPublishing.c"
+#line 7284 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_uploader_finalize (PublishingRESTSupportBatchUploader * obj) {
+static void
+publishing_piwigo_uploader_finalize (PublishingRESTSupportBatchUploader * obj)
+{
 	PublishingPiwigoUploader * self;
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_UPLOADER, PublishingPiwigoUploader);
@@ -6926,11 +7304,13 @@ static void publishing_piwigo_uploader_finalize (PublishingRESTSupportBatchUploa
 	_publishing_piwigo_publishing_parameters_unref0 (self->priv->parameters);
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_piwigo_uploader_parent_class)->finalize (obj);
-#line 6920 "PiwigoPublishing.c"
+#line 7298 "PiwigoPublishing.c"
 }
 
 
-GType publishing_piwigo_uploader_get_type (void) {
+GType
+publishing_piwigo_uploader_get_type (void)
+{
 	static volatile gsize publishing_piwigo_uploader_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_piwigo_uploader_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingPiwigoUploaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_piwigo_uploader_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPiwigoUploader), 0, (GInstanceInitFunc) publishing_piwigo_uploader_instance_init, NULL };
@@ -6942,50 +7322,53 @@ GType publishing_piwigo_uploader_get_type (void) {
 }
 
 
-PublishingPiwigoSSLErrorPane* publishing_piwigo_ssl_error_pane_construct (GType object_type, PublishingPiwigoSessionLoginTransaction* transaction, const gchar* host) {
+PublishingPiwigoSSLErrorPane*
+publishing_piwigo_ssl_error_pane_construct (GType object_type,
+                                            PublishingPiwigoSessionLoginTransaction* transaction,
+                                            const gchar* host)
+{
 	PublishingPiwigoSSLErrorPane * self = NULL;
 	GTlsCertificate* cert = NULL;
 	gchar* text = NULL;
-	PublishingPiwigoSessionLoginTransaction* _tmp0_;
-	GTlsCertificate* _tmp1_ = NULL;
-	gchar* _tmp2_;
-	const gchar* _tmp3_;
+	GTlsCertificate* _tmp0_ = NULL;
+	gchar* _tmp1_;
 #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION_LOGIN_TRANSACTION (transaction), NULL);
 #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (host != NULL, NULL);
 #line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = transaction;
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = publishing_rest_support_transaction_detailed_error_from_tls_flags (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_tmp1_);
+	_tmp1_ = publishing_rest_support_transaction_detailed_error_from_tls_flags (G_TYPE_CHECK_INSTANCE_CAST (transaction, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_tmp0_);
 #line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (cert);
 #line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	cert = _tmp1_;
+	cert = _tmp0_;
 #line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	text = _tmp2_;
-#line 1017 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp3_ = host;
+	text = _tmp1_;
 #line 1017 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self = (PublishingPiwigoSSLErrorPane*) g_object_new (object_type, "resource-path", PLUGIN_RESOURCE_PATH "/piwigo_ssl_failure_pane.ui", "default-id", "default", "cert", cert, "error-text", text, "host", _tmp3_, NULL);
+	self = (PublishingPiwigoSSLErrorPane*) g_object_new (object_type, "resource-path", PLUGIN_RESOURCE_PATH "/piwigo_ssl_failure_pane.ui", "default-id", "default", "cert", cert, "error-text", text, "host", host, NULL);
 #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (text);
 #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (cert);
 #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 6968 "PiwigoPublishing.c"
+#line 7346 "PiwigoPublishing.c"
 }
 
 
-PublishingPiwigoSSLErrorPane* publishing_piwigo_ssl_error_pane_new (PublishingPiwigoSessionLoginTransaction* transaction, const gchar* host) {
+PublishingPiwigoSSLErrorPane*
+publishing_piwigo_ssl_error_pane_new (PublishingPiwigoSessionLoginTransaction* transaction,
+                                      const gchar* host)
+{
 #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_ssl_error_pane_construct (PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, transaction, host);
-#line 6975 "PiwigoPublishing.c"
+#line 7356 "PiwigoPublishing.c"
 }
 
 
-static void __lambda5_ (PublishingPiwigoSSLErrorPane* self) {
+static void
+__lambda5_ (PublishingPiwigoSSLErrorPane* self)
+{
 	GcrSimpleCertificate* simple_cert = NULL;
 	GTlsCertificate* _tmp0_;
 	GByteArray* _tmp1_;
@@ -7053,13 +7436,13 @@ static void __lambda5_ (PublishingPiwigoSSLErrorPane* self) {
 	_tmp10_ = use_header;
 #line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp10_) {
-#line 7047 "PiwigoPublishing.c"
+#line 7430 "PiwigoPublishing.c"
 		GtkDialogFlags _tmp11_;
 #line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp11_ = flags;
 #line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		flags = _tmp11_ | GTK_DIALOG_USE_HEADER_BAR;
-#line 7053 "PiwigoPublishing.c"
+#line 7436 "PiwigoPublishing.c"
 	}
 #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp12_ = publishing_piwigo_ssl_error_pane_get_host (self);
@@ -7086,7 +7469,7 @@ static void __lambda5_ (PublishingPiwigoSSLErrorPane* self) {
 #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	dialog = _tmp19_;
 #line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp20_ = (GtkBox*) gtk_dialog_get_content_area (dialog);
+	_tmp20_ = gtk_dialog_get_content_area (dialog);
 #line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp21_ = widget;
 #line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -7107,32 +7490,42 @@ static void __lambda5_ (PublishingPiwigoSSLErrorPane* self) {
 	_g_object_unref0 (widget);
 #line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (simple_cert);
-#line 7101 "PiwigoPublishing.c"
+#line 7484 "PiwigoPublishing.c"
 }
 
 
-static void ___lambda5__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"
 	__lambda5_ ((PublishingPiwigoSSLErrorPane*) self);
-#line 7108 "PiwigoPublishing.c"
+#line 7494 "PiwigoPublishing.c"
 }
 
 
-static void __lambda6_ (PublishingPiwigoSSLErrorPane* self) {
+static void
+__lambda6_ (PublishingPiwigoSSLErrorPane* self)
+{
 #line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_emit (self, publishing_piwigo_ssl_error_pane_signals[PUBLISHING_PIWIGO_SSL_ERROR_PANE_PROCEED_SIGNAL], 0);
-#line 7115 "PiwigoPublishing.c"
+#line 7503 "PiwigoPublishing.c"
 }
 
 
-static void ___lambda6__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"
 	__lambda6_ ((PublishingPiwigoSSLErrorPane*) self);
-#line 7122 "PiwigoPublishing.c"
+#line 7513 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_ssl_error_pane_real_constructed (GObject* base) {
+static void
+publishing_piwigo_ssl_error_pane_real_constructed (GObject* base)
+{
 	PublishingPiwigoSSLErrorPane * self;
 	GtkLabel* label = NULL;
 	GtkBuilder* _tmp0_;
@@ -7273,11 +7666,13 @@ static void publishing_piwigo_ssl_error_pane_real_constructed (GObject* base) {
 	_g_object_unref0 (info);
 #line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (label);
-#line 7265 "PiwigoPublishing.c"
+#line 7658 "PiwigoPublishing.c"
 }
 
 
-gchar* publishing_piwigo_ssl_error_pane_get_host (PublishingPiwigoSSLErrorPane* self) {
+gchar*
+publishing_piwigo_ssl_error_pane_get_host (PublishingPiwigoSSLErrorPane* self)
+{
 	gchar* result;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
@@ -7291,34 +7686,36 @@ gchar* publishing_piwigo_ssl_error_pane_get_host (PublishingPiwigoSSLErrorPane*
 	result = _tmp1_;
 #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 7283 "PiwigoPublishing.c"
+#line 7678 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_ssl_error_pane_set_host (PublishingPiwigoSSLErrorPane* self, const gchar* value) {
+static void
+publishing_piwigo_ssl_error_pane_set_host (PublishingPiwigoSSLErrorPane* self,
+                                           const gchar* value)
+{
 #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_SSL_ERROR_PANE (self));
 #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (g_strcmp0 (value, publishing_piwigo_ssl_error_pane_get_host (self)) != 0) {
-#line 7292 "PiwigoPublishing.c"
-		const gchar* _tmp0_;
-		gchar* _tmp1_;
-#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp0_ = value;
+#line 7690 "PiwigoPublishing.c"
+		gchar* _tmp0_;
 #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp1_ = g_strdup (_tmp0_);
+		_tmp0_ = g_strdup (value);
 #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (self->priv->_host);
 #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		self->priv->_host = _tmp1_;
+		self->priv->_host = _tmp0_;
 #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_object_notify ((GObject *) self, "host");
-#line 7305 "PiwigoPublishing.c"
+		g_object_notify_by_pspec ((GObject *) self, publishing_piwigo_ssl_error_pane_properties[PUBLISHING_PIWIGO_SSL_ERROR_PANE_HOST_PROPERTY]);
+#line 7700 "PiwigoPublishing.c"
 	}
 }
 
 
-static GTlsCertificate* publishing_piwigo_ssl_error_pane_get_cert (PublishingPiwigoSSLErrorPane* self) {
+static GTlsCertificate*
+publishing_piwigo_ssl_error_pane_get_cert (PublishingPiwigoSSLErrorPane* self)
+{
 	GTlsCertificate* result;
 	GTlsCertificate* _tmp0_;
 #line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -7329,34 +7726,36 @@ static GTlsCertificate* publishing_piwigo_ssl_error_pane_get_cert (PublishingPiw
 	result = _tmp0_;
 #line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 7321 "PiwigoPublishing.c"
+#line 7718 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_ssl_error_pane_set_cert (PublishingPiwigoSSLErrorPane* self, GTlsCertificate* value) {
+static void
+publishing_piwigo_ssl_error_pane_set_cert (PublishingPiwigoSSLErrorPane* self,
+                                           GTlsCertificate* value)
+{
 #line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_SSL_ERROR_PANE (self));
 #line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (publishing_piwigo_ssl_error_pane_get_cert (self) != value) {
-#line 7330 "PiwigoPublishing.c"
+#line 7730 "PiwigoPublishing.c"
 		GTlsCertificate* _tmp0_;
-		GTlsCertificate* _tmp1_;
 #line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp0_ = value;
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp1_ = _g_object_ref0 (_tmp0_);
+		_tmp0_ = _g_object_ref0 (value);
 #line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_object_unref0 (self->priv->_cert);
 #line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		self->priv->_cert = _tmp1_;
+		self->priv->_cert = _tmp0_;
 #line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_object_notify ((GObject *) self, "cert");
-#line 7343 "PiwigoPublishing.c"
+		g_object_notify_by_pspec ((GObject *) self, publishing_piwigo_ssl_error_pane_properties[PUBLISHING_PIWIGO_SSL_ERROR_PANE_CERT_PROPERTY]);
+#line 7740 "PiwigoPublishing.c"
 	}
 }
 
 
-gchar* publishing_piwigo_ssl_error_pane_get_error_text (PublishingPiwigoSSLErrorPane* self) {
+gchar*
+publishing_piwigo_ssl_error_pane_get_error_text (PublishingPiwigoSSLErrorPane* self)
+{
 	gchar* result;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
@@ -7370,34 +7769,36 @@ gchar* publishing_piwigo_ssl_error_pane_get_error_text (PublishingPiwigoSSLError
 	result = _tmp1_;
 #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 7362 "PiwigoPublishing.c"
+#line 7761 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_ssl_error_pane_set_error_text (PublishingPiwigoSSLErrorPane* self, const gchar* value) {
+static void
+publishing_piwigo_ssl_error_pane_set_error_text (PublishingPiwigoSSLErrorPane* self,
+                                                 const gchar* value)
+{
 #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_SSL_ERROR_PANE (self));
 #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (g_strcmp0 (value, publishing_piwigo_ssl_error_pane_get_error_text (self)) != 0) {
-#line 7371 "PiwigoPublishing.c"
-		const gchar* _tmp0_;
-		gchar* _tmp1_;
+#line 7773 "PiwigoPublishing.c"
+		gchar* _tmp0_;
 #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp0_ = value;
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp1_ = g_strdup (_tmp0_);
+		_tmp0_ = g_strdup (value);
 #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (self->priv->_error_text);
 #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		self->priv->_error_text = _tmp1_;
+		self->priv->_error_text = _tmp0_;
 #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_object_notify ((GObject *) self, "error-text");
-#line 7384 "PiwigoPublishing.c"
+		g_object_notify_by_pspec ((GObject *) self, publishing_piwigo_ssl_error_pane_properties[PUBLISHING_PIWIGO_SSL_ERROR_PANE_ERROR_TEXT_PROPERTY]);
+#line 7783 "PiwigoPublishing.c"
 	}
 }
 
 
-static void publishing_piwigo_ssl_error_pane_class_init (PublishingPiwigoSSLErrorPaneClass * klass) {
+static void
+publishing_piwigo_ssl_error_pane_class_init (PublishingPiwigoSSLErrorPaneClass * klass)
+{
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_ssl_error_pane_parent_class = g_type_class_peek_parent (klass);
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -7411,25 +7812,29 @@ static void publishing_piwigo_ssl_error_pane_class_init (PublishingPiwigoSSLErro
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_piwigo_ssl_error_pane_finalize;
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_SSL_ERROR_PANE_HOST_PROPERTY, g_param_spec_string ("host", "host", "host", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_SSL_ERROR_PANE_HOST_PROPERTY, publishing_piwigo_ssl_error_pane_properties[PUBLISHING_PIWIGO_SSL_ERROR_PANE_HOST_PROPERTY] = g_param_spec_string ("host", "host", "host", NULL, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_SSL_ERROR_PANE_CERT_PROPERTY, g_param_spec_object ("cert", "cert", "cert", g_tls_certificate_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_SSL_ERROR_PANE_CERT_PROPERTY, publishing_piwigo_ssl_error_pane_properties[PUBLISHING_PIWIGO_SSL_ERROR_PANE_CERT_PROPERTY] = g_param_spec_object ("cert", "cert", "cert", g_tls_certificate_get_type (), G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_SSL_ERROR_PANE_ERROR_TEXT_PROPERTY, g_param_spec_string ("error-text", "error-text", "error-text", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_SSL_ERROR_PANE_ERROR_TEXT_PROPERTY, publishing_piwigo_ssl_error_pane_properties[PUBLISHING_PIWIGO_SSL_ERROR_PANE_ERROR_TEXT_PROPERTY] = g_param_spec_string ("error-text", "error-text", "error-text", NULL, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_ssl_error_pane_signals[PUBLISHING_PIWIGO_SSL_ERROR_PANE_PROCEED_SIGNAL] = g_signal_new ("proceed", PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 7410 "PiwigoPublishing.c"
+#line 7811 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_ssl_error_pane_instance_init (PublishingPiwigoSSLErrorPane * self) {
+static void
+publishing_piwigo_ssl_error_pane_instance_init (PublishingPiwigoSSLErrorPane * self)
+{
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv = PUBLISHING_PIWIGO_SSL_ERROR_PANE_GET_PRIVATE (self);
-#line 7417 "PiwigoPublishing.c"
+#line 7820 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_ssl_error_pane_finalize (GObject * obj) {
+static void
+publishing_piwigo_ssl_error_pane_finalize (GObject * obj)
+{
 	PublishingPiwigoSSLErrorPane * self;
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPane);
@@ -7441,11 +7846,13 @@ static void publishing_piwigo_ssl_error_pane_finalize (GObject * obj) {
 	_g_free0 (self->priv->_error_text);
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (publishing_piwigo_ssl_error_pane_parent_class)->finalize (obj);
-#line 7433 "PiwigoPublishing.c"
+#line 7838 "PiwigoPublishing.c"
 }
 
 
-GType publishing_piwigo_ssl_error_pane_get_type (void) {
+GType
+publishing_piwigo_ssl_error_pane_get_type (void)
+{
 	static volatile gsize publishing_piwigo_ssl_error_pane_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_piwigo_ssl_error_pane_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingPiwigoSSLErrorPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_piwigo_ssl_error_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPiwigoSSLErrorPane), 0, (GInstanceInitFunc) publishing_piwigo_ssl_error_pane_instance_init, NULL };
@@ -7457,7 +7864,12 @@ GType publishing_piwigo_ssl_error_pane_get_type (void) {
 }
 
 
-static void _vala_publishing_piwigo_ssl_error_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
+static void
+_vala_publishing_piwigo_ssl_error_pane_get_property (GObject * object,
+                                                     guint property_id,
+                                                     GValue * value,
+                                                     GParamSpec * pspec)
+{
 	PublishingPiwigoSSLErrorPane * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPane);
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -7480,18 +7892,23 @@ static void _vala_publishing_piwigo_ssl_error_pane_get_property (GObject * objec
 		g_value_take_string (value, publishing_piwigo_ssl_error_pane_get_error_text (self));
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
-#line 7472 "PiwigoPublishing.c"
+#line 7884 "PiwigoPublishing.c"
 		default:
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
-#line 7478 "PiwigoPublishing.c"
+#line 7890 "PiwigoPublishing.c"
 	}
 }
 
 
-static void _vala_publishing_piwigo_ssl_error_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
+static void
+_vala_publishing_piwigo_ssl_error_pane_set_property (GObject * object,
+                                                     guint property_id,
+                                                     const GValue * value,
+                                                     GParamSpec * pspec)
+{
 	PublishingPiwigoSSLErrorPane * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPane);
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -7514,18 +7931,20 @@ static void _vala_publishing_piwigo_ssl_error_pane_set_property (GObject * objec
 		publishing_piwigo_ssl_error_pane_set_error_text (self, g_value_get_string (value));
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
-#line 7506 "PiwigoPublishing.c"
+#line 7923 "PiwigoPublishing.c"
 		default:
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
-#line 7512 "PiwigoPublishing.c"
+#line 7929 "PiwigoPublishing.c"
 	}
 }
 
 
-GType publishing_piwigo_authentication_pane_mode_get_type (void) {
+GType
+publishing_piwigo_authentication_pane_mode_get_type (void)
+{
 	static volatile gsize publishing_piwigo_authentication_pane_mode_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_piwigo_authentication_pane_mode_type_id__volatile)) {
 		static const GEnumValue values[] = {{PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_INTRO, "PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_INTRO", "intro"}, {PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_URL, "PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_URL", "failed-retry-url"}, {PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER, "PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER", "failed-retry-user"}, {0, NULL, NULL}};
@@ -7537,60 +7956,75 @@ GType publishing_piwigo_authentication_pane_mode_get_type (void) {
 }
 
 
-PublishingPiwigoAuthenticationPane* publishing_piwigo_authentication_pane_construct (GType object_type, PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoAuthenticationPaneMode mode) {
+PublishingPiwigoAuthenticationPane*
+publishing_piwigo_authentication_pane_construct (GType object_type,
+                                                 PublishingPiwigoPiwigoPublisher* publisher,
+                                                 PublishingPiwigoAuthenticationPaneMode mode)
+{
 	PublishingPiwigoAuthenticationPane * self = NULL;
-	PublishingPiwigoAuthenticationPaneMode _tmp0_;
-	PublishingPiwigoPiwigoPublisher* _tmp1_;
 #line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (publisher), NULL);
 #line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = mode;
-#line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = publisher;
-#line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self = (PublishingPiwigoAuthenticationPane*) g_object_new (object_type, "resource-path", PLUGIN_RESOURCE_PATH "/piwigo_authentication_pane.ui", "connect-signals", TRUE, "default-id", "login_button", "mode", _tmp0_, "publisher", _tmp1_, NULL);
+	self = (PublishingPiwigoAuthenticationPane*) g_object_new (object_type, "resource-path", PLUGIN_RESOURCE_PATH "/piwigo_authentication_pane.ui", "connect-signals", TRUE, "default-id", "login_button", "mode", mode, "publisher", publisher, NULL);
 #line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 7543 "PiwigoPublishing.c"
+#line 7960 "PiwigoPublishing.c"
 }
 
 
-PublishingPiwigoAuthenticationPane* publishing_piwigo_authentication_pane_new (PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoAuthenticationPaneMode mode) {
+PublishingPiwigoAuthenticationPane*
+publishing_piwigo_authentication_pane_new (PublishingPiwigoPiwigoPublisher* publisher,
+                                           PublishingPiwigoAuthenticationPaneMode mode)
+{
 #line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_authentication_pane_construct (PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, publisher, mode);
-#line 7550 "PiwigoPublishing.c"
+#line 7970 "PiwigoPublishing.c"
 }
 
 
-static void _publishing_piwigo_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
+static void
+_publishing_piwigo_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender,
+                                                                             gpointer self)
+{
 #line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_on_user_changed ((PublishingPiwigoAuthenticationPane*) self);
-#line 7557 "PiwigoPublishing.c"
+#line 7980 "PiwigoPublishing.c"
 }
 
 
-static void _publishing_piwigo_authentication_pane_on_url_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
+static void
+_publishing_piwigo_authentication_pane_on_url_changed_gtk_editable_changed (GtkEditable* _sender,
+                                                                            gpointer self)
+{
 #line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_on_url_changed ((PublishingPiwigoAuthenticationPane*) self);
-#line 7564 "PiwigoPublishing.c"
+#line 7990 "PiwigoPublishing.c"
 }
 
 
-static void _publishing_piwigo_authentication_pane_on_password_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
+static void
+_publishing_piwigo_authentication_pane_on_password_changed_gtk_editable_changed (GtkEditable* _sender,
+                                                                                 gpointer self)
+{
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_on_password_changed ((PublishingPiwigoAuthenticationPane*) self);
-#line 7571 "PiwigoPublishing.c"
+#line 8000 "PiwigoPublishing.c"
 }
 
 
-static void _publishing_piwigo_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_piwigo_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                   gpointer self)
+{
 #line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_on_login_button_clicked ((PublishingPiwigoAuthenticationPane*) self);
-#line 7578 "PiwigoPublishing.c"
+#line 8010 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_authentication_pane_real_constructed (GObject* base) {
+static void
+publishing_piwigo_authentication_pane_real_constructed (GObject* base)
+{
 	PublishingPiwigoAuthenticationPane * self;
 	GtkBuilder* builder = NULL;
 	GtkBuilder* _tmp0_;
@@ -7625,18 +8059,17 @@ static void publishing_piwigo_authentication_pane_real_constructed (GObject* bas
 	GtkSwitch* _tmp41_;
 	GtkSwitch* _tmp42_;
 	PublishingPiwigoPiwigoPublisher* _tmp43_;
-	gboolean _tmp44_;
-	GtkBuilder* _tmp45_;
-	GObject* _tmp46_;
-	GtkButton* _tmp47_;
+	GtkBuilder* _tmp44_;
+	GObject* _tmp45_;
+	GtkButton* _tmp46_;
+	GtkEntry* _tmp47_;
 	GtkEntry* _tmp48_;
 	GtkEntry* _tmp49_;
-	GtkEntry* _tmp50_;
-	GtkButton* _tmp51_;
-	PublishingPiwigoPiwigoPublisher* _tmp52_;
+	GtkButton* _tmp50_;
+	PublishingPiwigoPiwigoPublisher* _tmp51_;
+	SpitPublishingPluginHost* _tmp52_;
 	SpitPublishingPluginHost* _tmp53_;
-	SpitPublishingPluginHost* _tmp54_;
-	GtkButton* _tmp55_;
+	GtkButton* _tmp54_;
 #line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPane);
 #line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -7659,7 +8092,7 @@ static void publishing_piwigo_authentication_pane_real_constructed (GObject* bas
 	switch (_tmp4_) {
 #line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_INTRO:
-#line 7651 "PiwigoPublishing.c"
+#line 8084 "PiwigoPublishing.c"
 		{
 			GtkLabel* _tmp5_;
 			const gchar* _tmp6_;
@@ -7671,11 +8104,11 @@ static void publishing_piwigo_authentication_pane_real_constructed (GObject* bas
 			gtk_label_set_text (_tmp5_, _tmp6_);
 #line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			break;
-#line 7663 "PiwigoPublishing.c"
+#line 8096 "PiwigoPublishing.c"
 		}
 #line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_URL:
-#line 7667 "PiwigoPublishing.c"
+#line 8100 "PiwigoPublishing.c"
 		{
 			GtkLabel* _tmp7_;
 			const gchar* _tmp8_;
@@ -7695,11 +8128,11 @@ static void publishing_piwigo_authentication_pane_real_constructed (GObject* bas
 			_g_free0 (_tmp10_);
 #line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			break;
-#line 7687 "PiwigoPublishing.c"
+#line 8120 "PiwigoPublishing.c"
 		}
 #line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER:
-#line 7691 "PiwigoPublishing.c"
+#line 8124 "PiwigoPublishing.c"
 		{
 			GtkLabel* _tmp11_;
 			const gchar* _tmp12_;
@@ -7719,12 +8152,12 @@ static void publishing_piwigo_authentication_pane_real_constructed (GObject* bas
 			_g_free0 (_tmp14_);
 #line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			break;
-#line 7711 "PiwigoPublishing.c"
+#line 8144 "PiwigoPublishing.c"
 		}
 		default:
 #line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
-#line 7716 "PiwigoPublishing.c"
+#line 8149 "PiwigoPublishing.c"
 	}
 #line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp15_ = builder;
@@ -7746,7 +8179,7 @@ static void publishing_piwigo_authentication_pane_real_constructed (GObject* bas
 	_tmp20_ = persistent_url;
 #line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp20_ != NULL) {
-#line 7738 "PiwigoPublishing.c"
+#line 8171 "PiwigoPublishing.c"
 		GtkEntry* _tmp21_;
 		const gchar* _tmp22_;
 #line 1124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -7755,7 +8188,7 @@ static void publishing_piwigo_authentication_pane_real_constructed (GObject* bas
 		_tmp22_ = persistent_url;
 #line 1124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_entry_set_text (_tmp21_, _tmp22_);
-#line 7747 "PiwigoPublishing.c"
+#line 8180 "PiwigoPublishing.c"
 	}
 #line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp23_ = builder;
@@ -7777,7 +8210,7 @@ static void publishing_piwigo_authentication_pane_real_constructed (GObject* bas
 	_tmp28_ = persistent_username;
 #line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp28_ != NULL) {
-#line 7769 "PiwigoPublishing.c"
+#line 8202 "PiwigoPublishing.c"
 		GtkEntry* _tmp29_;
 		const gchar* _tmp30_;
 #line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -7786,7 +8219,7 @@ static void publishing_piwigo_authentication_pane_real_constructed (GObject* bas
 		_tmp30_ = persistent_username;
 #line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_entry_set_text (_tmp29_, _tmp30_);
-#line 7778 "PiwigoPublishing.c"
+#line 8211 "PiwigoPublishing.c"
 	}
 #line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp31_ = builder;
@@ -7808,7 +8241,7 @@ static void publishing_piwigo_authentication_pane_real_constructed (GObject* bas
 	_tmp36_ = persistent_password;
 #line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp36_ != NULL) {
-#line 7800 "PiwigoPublishing.c"
+#line 8233 "PiwigoPublishing.c"
 		GtkEntry* _tmp37_;
 		const gchar* _tmp38_;
 #line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -7817,7 +8250,7 @@ static void publishing_piwigo_authentication_pane_real_constructed (GObject* bas
 		_tmp38_ = persistent_password;
 #line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_entry_set_text (_tmp37_, _tmp38_);
-#line 7809 "PiwigoPublishing.c"
+#line 8242 "PiwigoPublishing.c"
 	}
 #line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp39_ = builder;
@@ -7834,47 +8267,45 @@ static void publishing_piwigo_authentication_pane_real_constructed (GObject* bas
 #line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp43_ = self->priv->_publisher;
 #line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp44_ = publishing_piwigo_piwigo_publisher_get_remember_password (_tmp43_);
-#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	gtk_switch_set_active (_tmp42_, _tmp44_);
+	gtk_switch_set_active (_tmp42_, publishing_piwigo_piwigo_publisher_get_remember_password (_tmp43_));
 #line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp45_ = builder;
+	_tmp44_ = builder;
 #line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp46_ = gtk_builder_get_object (_tmp45_, "login_button");
+	_tmp45_ = gtk_builder_get_object (_tmp44_, "login_button");
 #line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp47_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp46_, gtk_button_get_type ()) ? ((GtkButton*) _tmp46_) : NULL);
+	_tmp46_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp45_, gtk_button_get_type ()) ? ((GtkButton*) _tmp45_) : NULL);
 #line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->login_button);
 #line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->login_button = _tmp47_;
+	self->priv->login_button = _tmp46_;
 #line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp48_ = self->priv->username_entry;
+	_tmp47_ = self->priv->username_entry;
 #line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_piwigo_authentication_pane_on_user_changed_gtk_editable_changed, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_editable_get_type (), GtkEditable), "changed", (GCallback) _publishing_piwigo_authentication_pane_on_user_changed_gtk_editable_changed, self, 0);
 #line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp49_ = self->priv->url_entry;
+	_tmp48_ = self->priv->url_entry;
 #line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_piwigo_authentication_pane_on_url_changed_gtk_editable_changed, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_editable_get_type (), GtkEditable), "changed", (GCallback) _publishing_piwigo_authentication_pane_on_url_changed_gtk_editable_changed, self, 0);
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp50_ = self->priv->password_entry;
+	_tmp49_ = self->priv->password_entry;
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_piwigo_authentication_pane_on_password_changed_gtk_editable_changed, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_editable_get_type (), GtkEditable), "changed", (GCallback) _publishing_piwigo_authentication_pane_on_password_changed_gtk_editable_changed, self, 0);
 #line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp51_ = self->priv->login_button;
+	_tmp50_ = self->priv->login_button;
 #line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_connect_object (_tmp51_, "clicked", (GCallback) _publishing_piwigo_authentication_pane_on_login_button_clicked_gtk_button_clicked, self, 0);
+	g_signal_connect_object (_tmp50_, "clicked", (GCallback) _publishing_piwigo_authentication_pane_on_login_button_clicked_gtk_button_clicked, self, 0);
 #line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp52_ = self->priv->_publisher;
+	_tmp51_ = self->priv->_publisher;
 #line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp53_ = publishing_piwigo_piwigo_publisher_get_host (_tmp52_);
+	_tmp52_ = publishing_piwigo_piwigo_publisher_get_host (_tmp51_);
 #line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp54_ = _tmp53_;
+	_tmp53_ = _tmp52_;
 #line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp55_ = self->priv->login_button;
+	_tmp54_ = self->priv->login_button;
 #line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	spit_publishing_plugin_host_set_dialog_default_widget (_tmp54_, G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_widget_get_type (), GtkWidget));
+	spit_publishing_plugin_host_set_dialog_default_widget (_tmp53_, G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_widget_get_type (), GtkWidget));
 #line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_object_unref0 (_tmp54_);
+	_g_object_unref0 (_tmp53_);
 #line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (persistent_password);
 #line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -7885,11 +8316,13 @@ static void publishing_piwigo_authentication_pane_real_constructed (GObject* bas
 	_g_object_unref0 (message_label);
 #line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (builder);
-#line 7877 "PiwigoPublishing.c"
+#line 8308 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_authentication_pane_on_login_button_clicked (PublishingPiwigoAuthenticationPane* self) {
+static void
+publishing_piwigo_authentication_pane_on_login_button_clicked (PublishingPiwigoAuthenticationPane* self)
+{
 	GtkEntry* _tmp0_;
 	const gchar* _tmp1_;
 	GtkEntry* _tmp2_;
@@ -7897,7 +8330,6 @@ static void publishing_piwigo_authentication_pane_on_login_button_clicked (Publi
 	GtkEntry* _tmp4_;
 	const gchar* _tmp5_;
 	GtkSwitch* _tmp6_;
-	gboolean _tmp7_;
 #line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self));
 #line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -7915,41 +8347,47 @@ static void publishing_piwigo_authentication_pane_on_login_button_clicked (Publi
 #line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = self->priv->remember_password_checkbutton;
 #line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp7_ = gtk_switch_get_active (_tmp6_);
-#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_emit (self, publishing_piwigo_authentication_pane_signals[PUBLISHING_PIWIGO_AUTHENTICATION_PANE_LOGIN_SIGNAL], 0, _tmp1_, _tmp3_, _tmp5_, _tmp7_);
-#line 7910 "PiwigoPublishing.c"
+	g_signal_emit (self, publishing_piwigo_authentication_pane_signals[PUBLISHING_PIWIGO_AUTHENTICATION_PANE_LOGIN_SIGNAL], 0, _tmp1_, _tmp3_, _tmp5_, gtk_switch_get_active (_tmp6_));
+#line 8340 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_authentication_pane_on_url_changed (PublishingPiwigoAuthenticationPane* self) {
+static void
+publishing_piwigo_authentication_pane_on_url_changed (PublishingPiwigoAuthenticationPane* self)
+{
 #line 1155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self));
 #line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_update_login_button_sensitivity (self);
-#line 7919 "PiwigoPublishing.c"
+#line 8351 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_authentication_pane_on_user_changed (PublishingPiwigoAuthenticationPane* self) {
+static void
+publishing_piwigo_authentication_pane_on_user_changed (PublishingPiwigoAuthenticationPane* self)
+{
 #line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self));
 #line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_update_login_button_sensitivity (self);
-#line 7928 "PiwigoPublishing.c"
+#line 8362 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_authentication_pane_on_password_changed (PublishingPiwigoAuthenticationPane* self) {
+static void
+publishing_piwigo_authentication_pane_on_password_changed (PublishingPiwigoAuthenticationPane* self)
+{
 #line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self));
 #line 1164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_update_login_button_sensitivity (self);
-#line 7937 "PiwigoPublishing.c"
+#line 8373 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_authentication_pane_update_login_button_sensitivity (PublishingPiwigoAuthenticationPane* self) {
+static void
+publishing_piwigo_authentication_pane_update_login_button_sensitivity (PublishingPiwigoAuthenticationPane* self)
+{
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	GtkEntry* _tmp2_;
@@ -7966,7 +8404,7 @@ static void publishing_piwigo_authentication_pane_update_login_button_sensitivit
 	_tmp4_ = _tmp3_;
 #line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp4_ != ((guint) 0)) {
-#line 7958 "PiwigoPublishing.c"
+#line 8396 "PiwigoPublishing.c"
 		GtkEntry* _tmp5_;
 		guint _tmp6_;
 		guint _tmp7_;
@@ -7978,15 +8416,15 @@ static void publishing_piwigo_authentication_pane_update_login_button_sensitivit
 		_tmp7_ = _tmp6_;
 #line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp1_ = _tmp7_ != ((guint) 0);
-#line 7970 "PiwigoPublishing.c"
+#line 8408 "PiwigoPublishing.c"
 	} else {
 #line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp1_ = FALSE;
-#line 7974 "PiwigoPublishing.c"
+#line 8412 "PiwigoPublishing.c"
 	}
 #line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp1_) {
-#line 7978 "PiwigoPublishing.c"
+#line 8416 "PiwigoPublishing.c"
 		GtkEntry* _tmp8_;
 		guint _tmp9_;
 		guint _tmp10_;
@@ -7998,21 +8436,23 @@ static void publishing_piwigo_authentication_pane_update_login_button_sensitivit
 		_tmp10_ = _tmp9_;
 #line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp0_ = _tmp10_ != ((guint) 0);
-#line 7990 "PiwigoPublishing.c"
+#line 8428 "PiwigoPublishing.c"
 	} else {
 #line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp0_ = FALSE;
-#line 7994 "PiwigoPublishing.c"
+#line 8432 "PiwigoPublishing.c"
 	}
 #line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp11_ = self->priv->login_button;
 #line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 8000 "PiwigoPublishing.c"
+#line 8438 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_authentication_pane_real_on_pane_installed (ShotwellPluginsCommonBuilderPane* base) {
+static void
+publishing_piwigo_authentication_pane_real_on_pane_installed (ShotwellPluginsCommonBuilderPane* base)
+{
 	PublishingPiwigoAuthenticationPane * self;
 	GtkEntry* _tmp0_;
 	GtkEntry* _tmp1_;
@@ -8035,11 +8475,13 @@ static void publishing_piwigo_authentication_pane_real_on_pane_installed (Shotwe
 	gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 1179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_update_login_button_sensitivity (self);
-#line 8027 "PiwigoPublishing.c"
+#line 8467 "PiwigoPublishing.c"
 }
 
 
-PublishingPiwigoAuthenticationPaneMode publishing_piwigo_authentication_pane_get_mode (PublishingPiwigoAuthenticationPane* self) {
+PublishingPiwigoAuthenticationPaneMode
+publishing_piwigo_authentication_pane_get_mode (PublishingPiwigoAuthenticationPane* self)
+{
 	PublishingPiwigoAuthenticationPaneMode result;
 	PublishingPiwigoAuthenticationPaneMode _tmp0_;
 #line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8050,29 +8492,30 @@ PublishingPiwigoAuthenticationPaneMode publishing_piwigo_authentication_pane_get
 	result = _tmp0_;
 #line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 8042 "PiwigoPublishing.c"
+#line 8484 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_authentication_pane_set_mode (PublishingPiwigoAuthenticationPane* self, PublishingPiwigoAuthenticationPaneMode value) {
+static void
+publishing_piwigo_authentication_pane_set_mode (PublishingPiwigoAuthenticationPane* self,
+                                                PublishingPiwigoAuthenticationPaneMode value)
+{
 #line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self));
 #line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (publishing_piwigo_authentication_pane_get_mode (self) != value) {
-#line 8051 "PiwigoPublishing.c"
-		PublishingPiwigoAuthenticationPaneMode _tmp0_;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp0_ = value;
 #line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		self->priv->_mode = _tmp0_;
+		self->priv->_mode = value;
 #line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_object_notify ((GObject *) self, "mode");
-#line 8059 "PiwigoPublishing.c"
+		g_object_notify_by_pspec ((GObject *) self, publishing_piwigo_authentication_pane_properties[PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_PROPERTY]);
+#line 8500 "PiwigoPublishing.c"
 	}
 }
 
 
-PublishingPiwigoPiwigoPublisher* publishing_piwigo_authentication_pane_get_publisher (PublishingPiwigoAuthenticationPane* self) {
+PublishingPiwigoPiwigoPublisher*
+publishing_piwigo_authentication_pane_get_publisher (PublishingPiwigoAuthenticationPane* self)
+{
 	PublishingPiwigoPiwigoPublisher* result;
 	PublishingPiwigoPiwigoPublisher* _tmp0_;
 #line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8083,29 +8526,35 @@ PublishingPiwigoPiwigoPublisher* publishing_piwigo_authentication_pane_get_publi
 	result = _tmp0_;
 #line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 8075 "PiwigoPublishing.c"
+#line 8518 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_authentication_pane_set_publisher (PublishingPiwigoAuthenticationPane* self, PublishingPiwigoPiwigoPublisher* value) {
+static void
+publishing_piwigo_authentication_pane_set_publisher (PublishingPiwigoAuthenticationPane* self,
+                                                     PublishingPiwigoPiwigoPublisher* value)
+{
 #line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self));
 #line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (publishing_piwigo_authentication_pane_get_publisher (self) != value) {
-#line 8084 "PiwigoPublishing.c"
-		PublishingPiwigoPiwigoPublisher* _tmp0_;
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp0_ = value;
 #line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		self->priv->_publisher = _tmp0_;
+		self->priv->_publisher = value;
 #line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_object_notify ((GObject *) self, "publisher");
-#line 8092 "PiwigoPublishing.c"
+		g_object_notify_by_pspec ((GObject *) self, publishing_piwigo_authentication_pane_properties[PUBLISHING_PIWIGO_AUTHENTICATION_PANE_PUBLISHER_PROPERTY]);
+#line 8534 "PiwigoPublishing.c"
 	}
 }
 
 
-static void g_cclosure_user_marshal_VOID__STRING_STRING_STRING_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+static void
+g_cclosure_user_marshal_VOID__STRING_STRING_STRING_BOOLEAN (GClosure * closure,
+                                                            GValue * return_value,
+                                                            guint n_param_values,
+                                                            const GValue * param_values,
+                                                            gpointer invocation_hint,
+                                                            gpointer marshal_data)
+{
 	typedef void (*GMarshalFunc_VOID__STRING_STRING_STRING_BOOLEAN) (gpointer data1, const char* arg_1, const char* arg_2, const char* arg_3, gboolean arg_4, gpointer data2);
 	register GMarshalFunc_VOID__STRING_STRING_STRING_BOOLEAN callback;
 	register GCClosure * cc;
@@ -8120,23 +8569,25 @@ static void g_cclosure_user_marshal_VOID__STRING_STRING_STRING_BOOLEAN (GClosure
 		data1 = closure->data;
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 8112 "PiwigoPublishing.c"
+#line 8561 "PiwigoPublishing.c"
 	} else {
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		data2 = closure->data;
-#line 8118 "PiwigoPublishing.c"
+#line 8567 "PiwigoPublishing.c"
 	}
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	callback = (GMarshalFunc_VOID__STRING_STRING_STRING_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	callback (data1, g_value_get_string (param_values + 1), g_value_get_string (param_values + 2), g_value_get_string (param_values + 3), g_value_get_boolean (param_values + 4), data2);
-#line 8124 "PiwigoPublishing.c"
+#line 8573 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_authentication_pane_class_init (PublishingPiwigoAuthenticationPaneClass * klass) {
+static void
+publishing_piwigo_authentication_pane_class_init (PublishingPiwigoAuthenticationPaneClass * klass)
+{
 	gchar* _tmp0_;
 	gchar* _tmp1_;
 	gchar* _tmp2_;
@@ -8155,9 +8606,9 @@ static void publishing_piwigo_authentication_pane_class_init (PublishingPiwigoAu
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_piwigo_authentication_pane_finalize;
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_PROPERTY, g_param_spec_enum ("mode", "mode", "mode", PUBLISHING_PIWIGO_AUTHENTICATION_PANE_TYPE_MODE, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_PROPERTY, publishing_piwigo_authentication_pane_properties[PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_PROPERTY] = g_param_spec_enum ("mode", "mode", "mode", PUBLISHING_PIWIGO_AUTHENTICATION_PANE_TYPE_MODE, 0, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_AUTHENTICATION_PANE_PUBLISHER_PROPERTY, g_param_spec_object ("publisher", "publisher", "publisher", PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_AUTHENTICATION_PANE_PUBLISHER_PROPERTY, publishing_piwigo_authentication_pane_properties[PUBLISHING_PIWIGO_AUTHENTICATION_PANE_PUBLISHER_PROPERTY] = g_param_spec_object ("publisher", "publisher", "publisher", PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_signals[PUBLISHING_PIWIGO_AUTHENTICATION_PANE_LOGIN_SIGNAL] = g_signal_new ("login", PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING_STRING_BOOLEAN, G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
 #line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8174,18 +8625,22 @@ static void publishing_piwigo_authentication_pane_class_init (PublishingPiwigoAu
 	_tmp2_ = g_strdup (_ ("Username and/or password invalid. Please try again"));
 #line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_FAILED_RETRY_USER_MESSAGE = _tmp2_;
-#line 8164 "PiwigoPublishing.c"
+#line 8615 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_authentication_pane_instance_init (PublishingPiwigoAuthenticationPane * self) {
+static void
+publishing_piwigo_authentication_pane_instance_init (PublishingPiwigoAuthenticationPane * self)
+{
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv = PUBLISHING_PIWIGO_AUTHENTICATION_PANE_GET_PRIVATE (self);
-#line 8171 "PiwigoPublishing.c"
+#line 8624 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_authentication_pane_finalize (GObject * obj) {
+static void
+publishing_piwigo_authentication_pane_finalize (GObject * obj)
+{
 	PublishingPiwigoAuthenticationPane * self;
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPane);
@@ -8201,7 +8656,7 @@ static void publishing_piwigo_authentication_pane_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->login_button);
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (publishing_piwigo_authentication_pane_parent_class)->finalize (obj);
-#line 8191 "PiwigoPublishing.c"
+#line 8646 "PiwigoPublishing.c"
 }
 
 
@@ -8209,7 +8664,9 @@ static void publishing_piwigo_authentication_pane_finalize (GObject * obj) {
  * The authentication pane used when asking service URL, user name and password
  * from the user.
  */
-GType publishing_piwigo_authentication_pane_get_type (void) {
+GType
+publishing_piwigo_authentication_pane_get_type (void)
+{
 	static volatile gsize publishing_piwigo_authentication_pane_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_piwigo_authentication_pane_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingPiwigoAuthenticationPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_piwigo_authentication_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPiwigoAuthenticationPane), 0, (GInstanceInitFunc) publishing_piwigo_authentication_pane_instance_init, NULL };
@@ -8221,7 +8678,12 @@ GType publishing_piwigo_authentication_pane_get_type (void) {
 }
 
 
-static void _vala_publishing_piwigo_authentication_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
+static void
+_vala_publishing_piwigo_authentication_pane_get_property (GObject * object,
+                                                          guint property_id,
+                                                          GValue * value,
+                                                          GParamSpec * pspec)
+{
 	PublishingPiwigoAuthenticationPane * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPane);
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8238,18 +8700,23 @@ static void _vala_publishing_piwigo_authentication_pane_get_property (GObject *
 		g_value_set_object (value, publishing_piwigo_authentication_pane_get_publisher (self));
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
-#line 8228 "PiwigoPublishing.c"
+#line 8690 "PiwigoPublishing.c"
 		default:
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
-#line 8234 "PiwigoPublishing.c"
+#line 8696 "PiwigoPublishing.c"
 	}
 }
 
 
-static void _vala_publishing_piwigo_authentication_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
+static void
+_vala_publishing_piwigo_authentication_pane_set_property (GObject * object,
+                                                          guint property_id,
+                                                          const GValue * value,
+                                                          GParamSpec * pspec)
+{
 	PublishingPiwigoAuthenticationPane * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPane);
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8266,165 +8733,188 @@ static void _vala_publishing_piwigo_authentication_pane_set_property (GObject *
 		publishing_piwigo_authentication_pane_set_publisher (self, g_value_get_object (value));
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
-#line 8256 "PiwigoPublishing.c"
+#line 8723 "PiwigoPublishing.c"
 		default:
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
-#line 8262 "PiwigoPublishing.c"
+#line 8729 "PiwigoPublishing.c"
 	}
 }
 
 
-static gpointer _publishing_piwigo_category_ref0 (gpointer self) {
+static gpointer
+_publishing_piwigo_category_ref0 (gpointer self)
+{
 #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self ? publishing_piwigo_category_ref (self) : NULL;
-#line 8270 "PiwigoPublishing.c"
+#line 8739 "PiwigoPublishing.c"
 }
 
 
-static PublishingPiwigoCategory** _vala_array_dup11 (PublishingPiwigoCategory** self, int length) {
+static PublishingPiwigoCategory**
+_vala_array_dup13 (PublishingPiwigoCategory** self,
+                   int length)
+{
 	PublishingPiwigoCategory** result;
 	int i;
 #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = g_new0 (PublishingPiwigoCategory*, length + 1);
 #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 8281 "PiwigoPublishing.c"
+#line 8753 "PiwigoPublishing.c"
 		PublishingPiwigoCategory* _tmp0_;
 #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp0_ = _publishing_piwigo_category_ref0 (self[i]);
 #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		result[i] = _tmp0_;
-#line 8287 "PiwigoPublishing.c"
+#line 8759 "PiwigoPublishing.c"
 	}
 #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 8291 "PiwigoPublishing.c"
+#line 8763 "PiwigoPublishing.c"
 }
 
 
-static gboolean _publishing_piwigo_category_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) {
+static gboolean
+_publishing_piwigo_category_equal_gee_equal_data_func (gconstpointer a,
+                                                       gconstpointer b,
+                                                       gpointer self)
+{
 	gboolean result;
 	result = publishing_piwigo_category_equal ((PublishingPiwigoCategory*) a, (PublishingPiwigoCategory*) b);
 #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 8300 "PiwigoPublishing.c"
-}
-
-
-PublishingPiwigoPublishingOptionsPane* publishing_piwigo_publishing_options_pane_construct (GType object_type, PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoCategory** categories, int categories_length1, gint last_category, gint last_permission_level, gint last_photo_size, gboolean last_title_as_comment, gboolean last_no_upload_tags, gboolean strip_metadata_enabled) {
+#line 8776 "PiwigoPublishing.c"
+}
+
+
+PublishingPiwigoPublishingOptionsPane*
+publishing_piwigo_publishing_options_pane_construct (GType object_type,
+                                                     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)
+{
 	PublishingPiwigoPublishingOptionsPane * self = NULL;
-	gint _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
-	gboolean _tmp3_;
-	gboolean _tmp4_;
-	gboolean _tmp5_;
-	PublishingPiwigoCategory** _tmp6_;
-	gint _tmp6__length1;
-	PublishingPiwigoCategory** _tmp7_;
-	gint _tmp7__length1;
-	GeeArrayList* _tmp8_;
-	GeeArrayList* _tmp9_;
-	PublishingPiwigoPiwigoPublisher* _tmp10_;
-	gchar* _tmp11_;
-	gchar* _tmp12_;
+	PublishingPiwigoCategory** _tmp0_;
+	gint _tmp0__length1;
+	GeeArrayList* _tmp1_;
+	GeeArrayList* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
 #line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (publisher), NULL);
 #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = last_category;
-#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = last_permission_level;
-#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = last_photo_size;
-#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp3_ = last_title_as_comment;
-#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp4_ = last_no_upload_tags;
-#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp5_ = strip_metadata_enabled;
+	_tmp0_ = (categories != NULL) ? _vala_array_dup13 (categories, categories_length1) : ((gpointer) categories);
 #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp6_ = categories;
+	_tmp0__length1 = categories_length1;
 #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp6__length1 = categories_length1;
+	_tmp1_ = gee_array_list_new_wrap (PUBLISHING_PIWIGO_TYPE_CATEGORY, (GBoxedCopyFunc) publishing_piwigo_category_ref, (GDestroyNotify) publishing_piwigo_category_unref, _tmp0_, _tmp0__length1, _publishing_piwigo_category_equal_gee_equal_data_func, NULL, NULL);
 #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp7_ = (_tmp6_ != NULL) ? _vala_array_dup11 (_tmp6_, _tmp6__length1) : ((gpointer) _tmp6_);
-#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp7__length1 = _tmp6__length1;
-#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp8_ = gee_array_list_new_wrap (PUBLISHING_PIWIGO_TYPE_CATEGORY, (GBoxedCopyFunc) publishing_piwigo_category_ref, (GDestroyNotify) publishing_piwigo_category_unref, _tmp7_, _tmp7__length1, _publishing_piwigo_category_equal_gee_equal_data_func, NULL, NULL);
-#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp9_ = _tmp8_;
-#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp10_ = publisher;
+	_tmp2_ = _tmp1_;
 #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp11_ = publishing_piwigo_publishing_options_pane_get_common_comment_if_possible (_tmp10_);
+	_tmp3_ = publishing_piwigo_publishing_options_pane_get_common_comment_if_possible (publisher);
 #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp12_ = _tmp11_;
+	_tmp4_ = _tmp3_;
 #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self = (PublishingPiwigoPublishingOptionsPane*) g_object_new (object_type, "resource-path", PLUGIN_RESOURCE_PATH "/piwigo_publishing_options_pane.ui", "connect-signals", TRUE, "default-id", "publish_button", "last-category", _tmp0_, "last-permission-level", _tmp1_, "last-photo-size", _tmp2_, "last-title-as-comment", _tmp3_, "last-no-upload-tags", _tmp4_, "strip-metadata-enabled", _tmp5_, "existing-categories", _tmp9_, "default-comment", _tmp12_, NULL);
+	self = (PublishingPiwigoPublishingOptionsPane*) g_object_new (object_type, "resource-path", PLUGIN_RESOURCE_PATH "/piwigo_publishing_options_pane.ui", "connect-signals", TRUE, "default-id", "publish_button", "last-category", last_category, "last-permission-level", last_permission_level, "last-photo-size", last_photo_size, "last-title-as-comment", last_title_as_comment, "last-no-upload-tags", last_no_upload_tags, "strip-metadata-enabled", strip_metadata_enabled, "existing-categories", _tmp2_, "default-comment", _tmp4_, NULL);
 #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_free0 (_tmp12_);
+	_g_free0 (_tmp4_);
 #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_object_unref0 (_tmp9_);
+	_g_object_unref0 (_tmp2_);
 #line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 8361 "PiwigoPublishing.c"
+#line 8821 "PiwigoPublishing.c"
 }
 
 
-PublishingPiwigoPublishingOptionsPane* publishing_piwigo_publishing_options_pane_new (PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoCategory** categories, int categories_length1, gint last_category, gint last_permission_level, gint last_photo_size, gboolean last_title_as_comment, gboolean last_no_upload_tags, gboolean strip_metadata_enabled) {
+PublishingPiwigoPublishingOptionsPane*
+publishing_piwigo_publishing_options_pane_new (PublishingPiwigoPiwigoPublisher* publisher,
+                                               PublishingPiwigoCategory** categories,
+                                               int categories_length1,
+                                               gint last_category,
+                                               gint last_permission_level,
+                                               gint last_photo_size,
+                                               gboolean last_title_as_comment,
+                                               gboolean last_no_upload_tags,
+                                               gboolean strip_metadata_enabled)
+{
 #line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_publishing_options_pane_construct (PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, publisher, categories, categories_length1, last_category, last_permission_level, last_photo_size, last_title_as_comment, last_no_upload_tags, strip_metadata_enabled);
-#line 8368 "PiwigoPublishing.c"
+#line 8838 "PiwigoPublishing.c"
 }
 
 
-static void _publishing_piwigo_publishing_options_pane_on_logout_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_piwigo_publishing_options_pane_on_logout_button_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                        gpointer self)
+{
 #line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_on_logout_button_clicked ((PublishingPiwigoPublishingOptionsPane*) self);
-#line 8375 "PiwigoPublishing.c"
+#line 8848 "PiwigoPublishing.c"
 }
 
 
-static void _publishing_piwigo_publishing_options_pane_on_publish_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_piwigo_publishing_options_pane_on_publish_button_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                         gpointer self)
+{
 #line 1275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_on_publish_button_clicked ((PublishingPiwigoPublishingOptionsPane*) self);
-#line 8382 "PiwigoPublishing.c"
+#line 8858 "PiwigoPublishing.c"
 }
 
 
-static void _publishing_piwigo_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_piwigo_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                             gpointer self)
+{
 #line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_on_use_existing_radio_clicked ((PublishingPiwigoPublishingOptionsPane*) self);
-#line 8389 "PiwigoPublishing.c"
+#line 8868 "PiwigoPublishing.c"
 }
 
 
-static void _publishing_piwigo_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_piwigo_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                           gpointer self)
+{
 #line 1278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_on_create_new_radio_clicked ((PublishingPiwigoPublishingOptionsPane*) self);
-#line 8396 "PiwigoPublishing.c"
+#line 8878 "PiwigoPublishing.c"
 }
 
 
-static void _publishing_piwigo_publishing_options_pane_on_new_category_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
+static void
+_publishing_piwigo_publishing_options_pane_on_new_category_entry_changed_gtk_editable_changed (GtkEditable* _sender,
+                                                                                               gpointer self)
+{
 #line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_on_new_category_entry_changed ((PublishingPiwigoPublishingOptionsPane*) self);
-#line 8403 "PiwigoPublishing.c"
+#line 8888 "PiwigoPublishing.c"
 }
 
 
-static void _publishing_piwigo_publishing_options_pane_on_existing_combo_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+static void
+_publishing_piwigo_publishing_options_pane_on_existing_combo_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+                                                                                            gpointer self)
+{
 #line 1280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_on_existing_combo_changed ((PublishingPiwigoPublishingOptionsPane*) self);
-#line 8410 "PiwigoPublishing.c"
+#line 8898 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_publishing_options_pane_real_constructed (GObject* base) {
+static void
+publishing_piwigo_publishing_options_pane_real_constructed (GObject* base)
+{
 	PublishingPiwigoPublishingOptionsPane * self;
 	GtkBuilder* builder = NULL;
 	GtkBuilder* _tmp0_;
@@ -8656,7 +9146,7 @@ static void publishing_piwigo_publishing_options_pane_real_constructed (GObject*
 #line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp44_ = self->priv->new_category_entry;
 #line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_piwigo_publishing_options_pane_on_new_category_entry_changed_gtk_editable_changed, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_editable_get_type (), GtkEditable), "changed", (GCallback) _publishing_piwigo_publishing_options_pane_on_new_category_entry_changed_gtk_editable_changed, self, 0);
 #line 1280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp45_ = self->priv->within_existing_combo;
 #line 1280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8693,96 +9183,124 @@ static void publishing_piwigo_publishing_options_pane_real_constructed (GObject*
 	gtk_text_buffer_set_text (_tmp52_, _tmp53_, -1);
 #line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (builder);
-#line 8683 "PiwigoPublishing.c"
+#line 9173 "PiwigoPublishing.c"
 }
 
 
-static void _vala_array_add36 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
+static void
+_vala_array_add39 (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"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoPermissionLevel*, *array, (*size) + 1);
-#line 8694 "PiwigoPublishing.c"
+#line 9189 "PiwigoPublishing.c"
 	}
 #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8700 "PiwigoPublishing.c"
+#line 9195 "PiwigoPublishing.c"
 }
 
 
-static void _vala_array_add37 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
+static void
+_vala_array_add40 (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"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoPermissionLevel*, *array, (*size) + 1);
-#line 8711 "PiwigoPublishing.c"
+#line 9211 "PiwigoPublishing.c"
 	}
 #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8717 "PiwigoPublishing.c"
+#line 9217 "PiwigoPublishing.c"
 }
 
 
-static void _vala_array_add38 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
+static void
+_vala_array_add41 (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"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoPermissionLevel*, *array, (*size) + 1);
-#line 8728 "PiwigoPublishing.c"
+#line 9233 "PiwigoPublishing.c"
 	}
 #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8734 "PiwigoPublishing.c"
+#line 9239 "PiwigoPublishing.c"
 }
 
 
-static void _vala_array_add39 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
+static void
+_vala_array_add42 (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"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoPermissionLevel*, *array, (*size) + 1);
-#line 8745 "PiwigoPublishing.c"
+#line 9255 "PiwigoPublishing.c"
 	}
 #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8751 "PiwigoPublishing.c"
+#line 9261 "PiwigoPublishing.c"
 }
 
 
-static void _vala_array_add40 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
+static void
+_vala_array_add43 (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"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoPermissionLevel*, *array, (*size) + 1);
-#line 8762 "PiwigoPublishing.c"
+#line 9277 "PiwigoPublishing.c"
 	}
 #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8768 "PiwigoPublishing.c"
+#line 9283 "PiwigoPublishing.c"
 }
 
 
-static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pane_create_perm_levels (PublishingPiwigoPublishingOptionsPane* self, int* result_length1) {
+static PublishingPiwigoPermissionLevel**
+publishing_piwigo_publishing_options_pane_create_perm_levels (PublishingPiwigoPublishingOptionsPane* self,
+                                                              int* result_length1)
+{
 	PublishingPiwigoPermissionLevel** result = NULL;
 	PublishingPiwigoPermissionLevel** _result_ = NULL;
 	PublishingPiwigoPermissionLevel** _tmp0_;
@@ -8822,7 +9340,7 @@ static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pa
 #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = publishing_piwigo_permission_level_new (0, _ ("Everyone"));
 #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add36 (&_result_, &_result__length1, &__result__size_, _tmp2_);
+	_vala_array_add39 (&_result_, &_result__length1, &__result__size_, _tmp2_);
 #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = _result_;
 #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8830,7 +9348,7 @@ static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pa
 #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = publishing_piwigo_permission_level_new (1, _ ("Admins, Family, Friends, Contacts"));
 #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add37 (&_result_, &_result__length1, &__result__size_, _tmp4_);
+	_vala_array_add40 (&_result_, &_result__length1, &__result__size_, _tmp4_);
 #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = _result_;
 #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8838,7 +9356,7 @@ static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pa
 #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = publishing_piwigo_permission_level_new (2, _ ("Admins, Family, Friends"));
 #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add38 (&_result_, &_result__length1, &__result__size_, _tmp6_);
+	_vala_array_add41 (&_result_, &_result__length1, &__result__size_, _tmp6_);
 #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = _result_;
 #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8846,7 +9364,7 @@ static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pa
 #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp8_ = publishing_piwigo_permission_level_new (4, _ ("Admins, Family"));
 #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add39 (&_result_, &_result__length1, &__result__size_, _tmp8_);
+	_vala_array_add42 (&_result_, &_result__length1, &__result__size_, _tmp8_);
 #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp9_ = _result_;
 #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8854,7 +9372,7 @@ static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pa
 #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp10_ = publishing_piwigo_permission_level_new (8, _ ("Admins"));
 #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add40 (&_result_, &_result__length1, &__result__size_, _tmp10_);
+	_vala_array_add43 (&_result_, &_result__length1, &__result__size_, _tmp10_);
 #line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp11_ = _result_;
 #line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8863,102 +9381,130 @@ static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pa
 	if (result_length1) {
 #line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*result_length1 = _tmp11__length1;
-#line 8853 "PiwigoPublishing.c"
+#line 9371 "PiwigoPublishing.c"
 	}
 #line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _tmp11_;
 #line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 8859 "PiwigoPublishing.c"
+#line 9377 "PiwigoPublishing.c"
 }
 
 
-static void _vala_array_add41 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
+static void
+_vala_array_add44 (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"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoSizeEntry*, *array, (*size) + 1);
-#line 8870 "PiwigoPublishing.c"
+#line 9393 "PiwigoPublishing.c"
 	}
 #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8876 "PiwigoPublishing.c"
+#line 9399 "PiwigoPublishing.c"
 }
 
 
-static void _vala_array_add42 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
+static void
+_vala_array_add45 (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"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoSizeEntry*, *array, (*size) + 1);
-#line 8887 "PiwigoPublishing.c"
+#line 9415 "PiwigoPublishing.c"
 	}
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8893 "PiwigoPublishing.c"
+#line 9421 "PiwigoPublishing.c"
 }
 
 
-static void _vala_array_add43 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
+static void
+_vala_array_add46 (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"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoSizeEntry*, *array, (*size) + 1);
-#line 8904 "PiwigoPublishing.c"
+#line 9437 "PiwigoPublishing.c"
 	}
 #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8910 "PiwigoPublishing.c"
+#line 9443 "PiwigoPublishing.c"
 }
 
 
-static void _vala_array_add44 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
+static void
+_vala_array_add47 (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"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoSizeEntry*, *array, (*size) + 1);
-#line 8921 "PiwigoPublishing.c"
+#line 9459 "PiwigoPublishing.c"
 	}
 #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8927 "PiwigoPublishing.c"
+#line 9465 "PiwigoPublishing.c"
 }
 
 
-static void _vala_array_add45 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
+static void
+_vala_array_add48 (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"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoSizeEntry*, *array, (*size) + 1);
-#line 8938 "PiwigoPublishing.c"
+#line 9481 "PiwigoPublishing.c"
 	}
 #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8944 "PiwigoPublishing.c"
+#line 9487 "PiwigoPublishing.c"
 }
 
 
-static PublishingPiwigoSizeEntry** publishing_piwigo_publishing_options_pane_create_sizes (PublishingPiwigoPublishingOptionsPane* self, int* result_length1) {
+static PublishingPiwigoSizeEntry**
+publishing_piwigo_publishing_options_pane_create_sizes (PublishingPiwigoPublishingOptionsPane* self,
+                                                        int* result_length1)
+{
 	PublishingPiwigoSizeEntry** result = NULL;
 	PublishingPiwigoSizeEntry** _result_ = NULL;
 	PublishingPiwigoSizeEntry** _tmp0_;
@@ -8998,7 +9544,7 @@ static PublishingPiwigoSizeEntry** publishing_piwigo_publishing_options_pane_cre
 #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = publishing_piwigo_size_entry_new (500, _ ("500 × 375 pixels"));
 #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add41 (&_result_, &_result__length1, &__result__size_, _tmp2_);
+	_vala_array_add44 (&_result_, &_result__length1, &__result__size_, _tmp2_);
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = _result_;
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9006,7 +9552,7 @@ static PublishingPiwigoSizeEntry** publishing_piwigo_publishing_options_pane_cre
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = publishing_piwigo_size_entry_new (1024, _ ("1024 × 768 pixels"));
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add42 (&_result_, &_result__length1, &__result__size_, _tmp4_);
+	_vala_array_add45 (&_result_, &_result__length1, &__result__size_, _tmp4_);
 #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = _result_;
 #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9014,7 +9560,7 @@ static PublishingPiwigoSizeEntry** publishing_piwigo_publishing_options_pane_cre
 #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = publishing_piwigo_size_entry_new (2048, _ ("2048 × 1536 pixels"));
 #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add43 (&_result_, &_result__length1, &__result__size_, _tmp6_);
+	_vala_array_add46 (&_result_, &_result__length1, &__result__size_, _tmp6_);
 #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = _result_;
 #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9022,7 +9568,7 @@ static PublishingPiwigoSizeEntry** publishing_piwigo_publishing_options_pane_cre
 #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp8_ = publishing_piwigo_size_entry_new (4096, _ ("4096 × 3072 pixels"));
 #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add44 (&_result_, &_result__length1, &__result__size_, _tmp8_);
+	_vala_array_add47 (&_result_, &_result__length1, &__result__size_, _tmp8_);
 #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp9_ = _result_;
 #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9030,7 +9576,7 @@ static PublishingPiwigoSizeEntry** publishing_piwigo_publishing_options_pane_cre
 #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp10_ = publishing_piwigo_size_entry_new (PUBLISHING_PIWIGO_ORIGINAL_SIZE, _ ("Original size"));
 #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add45 (&_result_, &_result__length1, &__result__size_, _tmp10_);
+	_vala_array_add48 (&_result_, &_result__length1, &__result__size_, _tmp10_);
 #line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp11_ = _result_;
 #line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9039,67 +9585,69 @@ static PublishingPiwigoSizeEntry** publishing_piwigo_publishing_options_pane_cre
 	if (result_length1) {
 #line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*result_length1 = _tmp11__length1;
-#line 9029 "PiwigoPublishing.c"
+#line 9575 "PiwigoPublishing.c"
 	}
 #line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _tmp11_;
 #line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 9035 "PiwigoPublishing.c"
+#line 9581 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_publishing_options_pane_on_logout_button_clicked (PublishingPiwigoPublishingOptionsPane* self) {
+static void
+publishing_piwigo_publishing_options_pane_on_logout_button_clicked (PublishingPiwigoPublishingOptionsPane* self)
+{
 #line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_emit (self, publishing_piwigo_publishing_options_pane_signals[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
-#line 9044 "PiwigoPublishing.c"
+#line 9592 "PiwigoPublishing.c"
 }
 
 
-static gpointer _publishing_piwigo_permission_level_ref0 (gpointer self) {
+static gpointer
+_publishing_piwigo_permission_level_ref0 (gpointer self)
+{
 #line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self ? publishing_piwigo_permission_level_ref (self) : NULL;
-#line 9051 "PiwigoPublishing.c"
+#line 9601 "PiwigoPublishing.c"
 }
 
 
-static gpointer _publishing_piwigo_size_entry_ref0 (gpointer self) {
+static gpointer
+_publishing_piwigo_size_entry_ref0 (gpointer self)
+{
 #line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self ? publishing_piwigo_size_entry_ref (self) : NULL;
-#line 9058 "PiwigoPublishing.c"
+#line 9610 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_publishing_options_pane_on_publish_button_clicked (PublishingPiwigoPublishingOptionsPane* self) {
+static void
+publishing_piwigo_publishing_options_pane_on_publish_button_clicked (PublishingPiwigoPublishingOptionsPane* self)
+{
 	PublishingPiwigoPublishingParameters* params = NULL;
 	PublishingPiwigoPublishingParameters* _tmp0_;
 	PublishingPiwigoPublishingParameters* _tmp1_;
 	PublishingPiwigoPermissionLevel** _tmp2_;
 	gint _tmp2__length1;
 	GtkComboBoxText* _tmp3_;
-	gint _tmp4_;
+	PublishingPiwigoPermissionLevel* _tmp4_;
 	PublishingPiwigoPermissionLevel* _tmp5_;
-	PublishingPiwigoPermissionLevel* _tmp6_;
-	PublishingPiwigoPublishingParameters* _tmp7_;
-	PublishingPiwigoSizeEntry** _tmp8_;
-	gint _tmp8__length1;
-	GtkComboBoxText* _tmp9_;
-	gint _tmp10_;
-	PublishingPiwigoSizeEntry* _tmp11_;
-	PublishingPiwigoSizeEntry* _tmp12_;
+	PublishingPiwigoPublishingParameters* _tmp6_;
+	PublishingPiwigoSizeEntry** _tmp7_;
+	gint _tmp7__length1;
+	GtkComboBoxText* _tmp8_;
+	PublishingPiwigoSizeEntry* _tmp9_;
+	PublishingPiwigoSizeEntry* _tmp10_;
+	PublishingPiwigoPublishingParameters* _tmp11_;
+	GtkCheckButton* _tmp12_;
 	PublishingPiwigoPublishingParameters* _tmp13_;
 	GtkCheckButton* _tmp14_;
-	gboolean _tmp15_;
-	PublishingPiwigoPublishingParameters* _tmp16_;
-	GtkCheckButton* _tmp17_;
-	gboolean _tmp18_;
-	GtkRadioButton* _tmp19_;
-	gboolean _tmp20_;
-	PublishingPiwigoPublishingParameters* _tmp53_;
-	GtkCheckButton* _tmp54_;
-	gboolean _tmp55_;
+	GtkRadioButton* _tmp15_;
+	PublishingPiwigoPublishingParameters* _tmp46_;
+	GtkCheckButton* _tmp47_;
 #line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9115,204 +9663,188 @@ static void publishing_piwigo_publishing_options_pane_on_publish_button_clicked
 #line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = self->priv->perms_combo;
 #line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp4_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox));
+	_tmp4_ = _tmp2_[gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox))];
 #line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp5_ = _tmp2_[_tmp4_];
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp6_ = _publishing_piwigo_permission_level_ref0 (_tmp5_);
+	_tmp5_ = _publishing_piwigo_permission_level_ref0 (_tmp4_);
 #line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_piwigo_permission_level_unref0 (_tmp1_->perm_level);
 #line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_->perm_level = _tmp6_;
-#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp7_ = params;
+	_tmp1_->perm_level = _tmp5_;
 #line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp8_ = self->priv->photo_sizes;
+	_tmp6_ = params;
 #line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp8__length1 = self->priv->photo_sizes_length1;
+	_tmp7_ = self->priv->photo_sizes;
 #line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp9_ = self->priv->size_combo;
+	_tmp7__length1 = self->priv->photo_sizes_length1;
 #line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp10_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_combo_box_get_type (), GtkComboBox));
+	_tmp8_ = self->priv->size_combo;
 #line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp11_ = _tmp8_[_tmp10_];
+	_tmp9_ = _tmp7_[gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox))];
 #line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp12_ = _publishing_piwigo_size_entry_ref0 (_tmp11_);
+	_tmp10_ = _publishing_piwigo_size_entry_ref0 (_tmp9_);
 #line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_publishing_piwigo_size_entry_unref0 (_tmp7_->photo_size);
+	_publishing_piwigo_size_entry_unref0 (_tmp6_->photo_size);
 #line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp7_->photo_size = _tmp12_;
+	_tmp6_->photo_size = _tmp10_;
 #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp13_ = params;
-#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp14_ = self->priv->title_as_comment_check;
+	_tmp11_ = params;
 #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp15_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_toggle_button_get_type (), GtkToggleButton));
+	_tmp12_ = self->priv->title_as_comment_check;
 #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp13_->title_as_comment = _tmp15_;
-#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp16_ = params;
+	_tmp11_->title_as_comment = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_toggle_button_get_type (), GtkToggleButton));
 #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp17_ = self->priv->no_upload_tags_check;
+	_tmp13_ = params;
 #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp18_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_toggle_button_get_type (), GtkToggleButton));
+	_tmp14_ = self->priv->no_upload_tags_check;
 #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp16_->no_upload_tags = _tmp18_;
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp19_ = self->priv->create_new_radio;
+	_tmp13_->no_upload_tags = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_toggle_button_get_type (), GtkToggleButton));
 #line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp20_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_toggle_button_get_type (), GtkToggleButton));
+	_tmp15_ = self->priv->create_new_radio;
 #line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (_tmp20_) {
-#line 9154 "PiwigoPublishing.c"
+	if (gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_toggle_button_get_type (), GtkToggleButton))) {
+#line 9692 "PiwigoPublishing.c"
 		gchar* uploadcomment = NULL;
-		GtkTextView* _tmp21_;
-		GtkTextBuffer* _tmp22_;
-		GtkTextBuffer* _tmp23_;
-		gchar* _tmp24_;
-		gchar* _tmp25_;
-		gchar* _tmp26_;
-		gchar* _tmp27_;
-		gchar* _tmp28_;
+		GtkTextView* _tmp16_;
+		GtkTextBuffer* _tmp17_;
+		GtkTextBuffer* _tmp18_;
+		gchar* _tmp19_;
+		gchar* _tmp20_;
+		gchar* _tmp21_;
+		gchar* _tmp22_;
+		gchar* _tmp23_;
 		gint a = 0;
-		GtkComboBoxText* _tmp29_;
-		gint _tmp30_;
-		gint _tmp31_;
+		GtkComboBoxText* _tmp24_;
+		gint _tmp25_;
 #line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp21_ = self->priv->album_comment;
+		_tmp16_ = self->priv->album_comment;
 #line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp22_ = gtk_text_view_get_buffer (_tmp21_);
+		_tmp17_ = gtk_text_view_get_buffer (_tmp16_);
 #line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp23_ = _tmp22_;
+		_tmp18_ = _tmp17_;
 #line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_object_get (_tmp23_, "text", &_tmp24_, NULL);
+		g_object_get (_tmp18_, "text", &_tmp19_, NULL);
 #line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp25_ = _tmp24_;
+		_tmp20_ = _tmp19_;
 #line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp26_ = _tmp25_;
+		_tmp21_ = _tmp20_;
 #line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp27_ = string_strip (_tmp26_);
+		_tmp22_ = string_strip (_tmp21_);
 #line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp28_ = _tmp27_;
+		_tmp23_ = _tmp22_;
 #line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_free0 (_tmp26_);
+		_g_free0 (_tmp21_);
 #line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		uploadcomment = _tmp28_;
-#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp29_ = self->priv->within_existing_combo;
+		uploadcomment = _tmp23_;
 #line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp30_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_combo_box_get_type (), GtkComboBox));
+		_tmp24_ = self->priv->within_existing_combo;
 #line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		a = _tmp30_;
+		a = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_combo_box_get_type (), GtkComboBox));
 #line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp31_ = a;
+		_tmp25_ = a;
 #line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		if (_tmp31_ == 0) {
-#line 9198 "PiwigoPublishing.c"
-			PublishingPiwigoPublishingParameters* _tmp32_;
-			GtkEntry* _tmp33_;
-			const gchar* _tmp34_;
-			const gchar* _tmp35_;
-			PublishingPiwigoCategory* _tmp36_;
+		if (_tmp25_ == 0) {
+#line 9733 "PiwigoPublishing.c"
+			PublishingPiwigoPublishingParameters* _tmp26_;
+			GtkEntry* _tmp27_;
+			const gchar* _tmp28_;
+			const gchar* _tmp29_;
+			PublishingPiwigoCategory* _tmp30_;
 #line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp32_ = params;
+			_tmp26_ = params;
 #line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp33_ = self->priv->new_category_entry;
+			_tmp27_ = self->priv->new_category_entry;
 #line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp34_ = gtk_entry_get_text (_tmp33_);
+			_tmp28_ = gtk_entry_get_text (_tmp27_);
 #line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp35_ = uploadcomment;
+			_tmp29_ = uploadcomment;
 #line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp36_ = publishing_piwigo_category_new_local (_tmp34_, 0, _tmp35_);
+			_tmp30_ = publishing_piwigo_category_new_local (_tmp28_, 0, _tmp29_);
 #line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_publishing_piwigo_category_unref0 (_tmp32_->category);
+			_publishing_piwigo_category_unref0 (_tmp26_->category);
 #line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp32_->category = _tmp36_;
-#line 9218 "PiwigoPublishing.c"
+			_tmp26_->category = _tmp30_;
+#line 9753 "PiwigoPublishing.c"
 		} else {
-			gint _tmp37_;
-			PublishingPiwigoPublishingParameters* _tmp38_;
-			GtkEntry* _tmp39_;
+			gint _tmp31_;
+			PublishingPiwigoPublishingParameters* _tmp32_;
+			GtkEntry* _tmp33_;
+			const gchar* _tmp34_;
+			GeeList* _tmp35_;
+			gint _tmp36_;
+			gpointer _tmp37_;
+			PublishingPiwigoCategory* _tmp38_;
+			gint _tmp39_;
 			const gchar* _tmp40_;
-			GeeList* _tmp41_;
-			gint _tmp42_;
-			gpointer _tmp43_;
-			PublishingPiwigoCategory* _tmp44_;
-			gint _tmp45_;
-			const gchar* _tmp46_;
-			PublishingPiwigoCategory* _tmp47_;
+			PublishingPiwigoCategory* _tmp41_;
 #line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp37_ = a;
+			_tmp31_ = a;
 #line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			a = _tmp37_ - 1;
+			a = _tmp31_ - 1;
 #line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp38_ = params;
+			_tmp32_ = params;
 #line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp39_ = self->priv->new_category_entry;
+			_tmp33_ = self->priv->new_category_entry;
 #line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp40_ = gtk_entry_get_text (_tmp39_);
+			_tmp34_ = gtk_entry_get_text (_tmp33_);
 #line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp41_ = self->priv->_existing_categories;
+			_tmp35_ = self->priv->_existing_categories;
 #line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp42_ = a;
+			_tmp36_ = a;
 #line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp43_ = gee_list_get (_tmp41_, _tmp42_);
+			_tmp37_ = gee_list_get (_tmp35_, _tmp36_);
 #line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp44_ = (PublishingPiwigoCategory*) _tmp43_;
+			_tmp38_ = (PublishingPiwigoCategory*) _tmp37_;
 #line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp45_ = _tmp44_->id;
+			_tmp39_ = _tmp38_->id;
 #line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp46_ = uploadcomment;
+			_tmp40_ = uploadcomment;
 #line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp47_ = publishing_piwigo_category_new_local (_tmp40_, _tmp45_, _tmp46_);
+			_tmp41_ = publishing_piwigo_category_new_local (_tmp34_, _tmp39_, _tmp40_);
 #line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_publishing_piwigo_category_unref0 (_tmp38_->category);
+			_publishing_piwigo_category_unref0 (_tmp32_->category);
 #line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp38_->category = _tmp47_;
+			_tmp32_->category = _tmp41_;
 #line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_publishing_piwigo_category_unref0 (_tmp44_);
-#line 9261 "PiwigoPublishing.c"
+			_publishing_piwigo_category_unref0 (_tmp38_);
+#line 9796 "PiwigoPublishing.c"
 		}
 #line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (uploadcomment);
-#line 9265 "PiwigoPublishing.c"
+#line 9800 "PiwigoPublishing.c"
 	} else {
-		PublishingPiwigoPublishingParameters* _tmp48_;
-		GeeList* _tmp49_;
-		GtkComboBoxText* _tmp50_;
-		gint _tmp51_;
-		gpointer _tmp52_;
+		PublishingPiwigoPublishingParameters* _tmp42_;
+		GeeList* _tmp43_;
+		GtkComboBoxText* _tmp44_;
+		gpointer _tmp45_;
 #line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp48_ = params;
+		_tmp42_ = params;
 #line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp49_ = self->priv->_existing_categories;
+		_tmp43_ = self->priv->_existing_categories;
 #line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp50_ = self->priv->existing_categories_combo;
+		_tmp44_ = self->priv->existing_categories_combo;
 #line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp51_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_combo_box_get_type (), GtkComboBox));
+		_tmp45_ = gee_list_get (_tmp43_, gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_combo_box_get_type (), GtkComboBox)));
 #line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp52_ = gee_list_get (_tmp49_, _tmp51_);
+		_publishing_piwigo_category_unref0 (_tmp42_->category);
 #line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_publishing_piwigo_category_unref0 (_tmp48_->category);
-#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp48_->category = (PublishingPiwigoCategory*) _tmp52_;
-#line 9286 "PiwigoPublishing.c"
+		_tmp42_->category = (PublishingPiwigoCategory*) _tmp45_;
+#line 9818 "PiwigoPublishing.c"
 	}
 #line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp53_ = params;
+	_tmp46_ = params;
 #line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp54_ = self->priv->strip_metadata_check;
+	_tmp47_ = self->priv->strip_metadata_check;
 #line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp55_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_emit (self, publishing_piwigo_publishing_options_pane_signals[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp53_, _tmp55_);
+	g_signal_emit (self, publishing_piwigo_publishing_options_pane_signals[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp46_, gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_toggle_button_get_type (), GtkToggleButton)));
 #line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_piwigo_publishing_parameters_unref0 (params);
-#line 9298 "PiwigoPublishing.c"
+#line 9828 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_publishing_options_pane_on_use_existing_radio_clicked (PublishingPiwigoPublishingOptionsPane* self) {
+static void
+publishing_piwigo_publishing_options_pane_on_use_existing_radio_clicked (PublishingPiwigoPublishingOptionsPane* self)
+{
 	GtkComboBoxText* _tmp0_;
 	GtkEntry* _tmp1_;
 	GtkLabel* _tmp2_;
@@ -9352,11 +9884,13 @@ static void publishing_piwigo_publishing_options_pane_on_use_existing_radio_clic
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 9342 "PiwigoPublishing.c"
+#line 9874 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_publishing_options_pane_on_create_new_radio_clicked (PublishingPiwigoPublishingOptionsPane* self) {
+static void
+publishing_piwigo_publishing_options_pane_on_create_new_radio_clicked (PublishingPiwigoPublishingOptionsPane* self)
+{
 	GtkEntry* _tmp0_;
 	GtkLabel* _tmp1_;
 	GtkComboBoxText* _tmp2_;
@@ -9396,42 +9930,46 @@ static void publishing_piwigo_publishing_options_pane_on_create_new_radio_clicke
 	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget));
 #line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 9386 "PiwigoPublishing.c"
+#line 9920 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_publishing_options_pane_on_new_category_entry_changed (PublishingPiwigoPublishingOptionsPane* self) {
+static void
+publishing_piwigo_publishing_options_pane_on_new_category_entry_changed (PublishingPiwigoPublishingOptionsPane* self)
+{
 #line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 9395 "PiwigoPublishing.c"
+#line 9931 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_publishing_options_pane_on_existing_combo_changed (PublishingPiwigoPublishingOptionsPane* self) {
+static void
+publishing_piwigo_publishing_options_pane_on_existing_combo_changed (PublishingPiwigoPublishingOptionsPane* self)
+{
 #line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 9404 "PiwigoPublishing.c"
+#line 9942 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (PublishingPiwigoPublishingOptionsPane* self) {
+static void
+publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (PublishingPiwigoPublishingOptionsPane* self)
+{
 	gchar* category_name = NULL;
 	GtkEntry* _tmp0_;
 	const gchar* _tmp1_;
 	gchar* _tmp2_;
 	gint a = 0;
 	GtkComboBoxText* _tmp3_;
-	gint _tmp4_;
 	gchar* search_name = NULL;
-	gint _tmp5_;
-	gboolean _tmp18_ = FALSE;
-	GtkRadioButton* _tmp19_;
-	gboolean _tmp20_;
-	GtkButton* _tmp25_;
+	gint _tmp4_;
+	gboolean _tmp17_ = FALSE;
+	GtkRadioButton* _tmp18_;
+	GtkButton* _tmp22_;
 #line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9445,116 +9983,111 @@ static void publishing_piwigo_publishing_options_pane_update_publish_button_sens
 #line 1372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = self->priv->within_existing_combo;
 #line 1372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp4_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	a = _tmp4_;
+	a = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox));
 #line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp5_ = a;
+	_tmp4_ = a;
 #line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (_tmp5_ <= 0) {
-#line 9442 "PiwigoPublishing.c"
-		const gchar* _tmp6_;
-		gchar* _tmp7_;
+	if (_tmp4_ <= 0) {
+#line 9978 "PiwigoPublishing.c"
+		const gchar* _tmp5_;
+		gchar* _tmp6_;
 #line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp6_ = category_name;
+		_tmp5_ = category_name;
 #line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp7_ = g_strconcat ("/ ", _tmp6_, NULL);
+		_tmp6_ = g_strconcat ("/ ", _tmp5_, NULL);
 #line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (search_name);
 #line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		search_name = _tmp7_;
-#line 9453 "PiwigoPublishing.c"
+		search_name = _tmp6_;
+#line 9989 "PiwigoPublishing.c"
 	} else {
-		gint _tmp8_;
-		GeeList* _tmp9_;
-		gint _tmp10_;
-		gpointer _tmp11_;
-		PublishingPiwigoCategory* _tmp12_;
-		const gchar* _tmp13_;
+		gint _tmp7_;
+		GeeList* _tmp8_;
+		gint _tmp9_;
+		gpointer _tmp10_;
+		PublishingPiwigoCategory* _tmp11_;
+		const gchar* _tmp12_;
+		gchar* _tmp13_;
 		gchar* _tmp14_;
-		gchar* _tmp15_;
-		const gchar* _tmp16_;
-		gchar* _tmp17_;
+		const gchar* _tmp15_;
+		gchar* _tmp16_;
 #line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp8_ = a;
+		_tmp7_ = a;
 #line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		a = _tmp8_ - 1;
+		a = _tmp7_ - 1;
 #line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp9_ = self->priv->_existing_categories;
+		_tmp8_ = self->priv->_existing_categories;
 #line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp10_ = a;
+		_tmp9_ = a;
 #line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp11_ = gee_list_get (_tmp9_, _tmp10_);
+		_tmp10_ = gee_list_get (_tmp8_, _tmp9_);
 #line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp12_ = (PublishingPiwigoCategory*) _tmp11_;
+		_tmp11_ = (PublishingPiwigoCategory*) _tmp10_;
 #line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp13_ = _tmp12_->display_name;
+		_tmp12_ = _tmp11_->display_name;
 #line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp14_ = g_strconcat (_tmp13_, "/ ", NULL);
+		_tmp13_ = g_strconcat (_tmp12_, "/ ", NULL);
 #line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp15_ = _tmp14_;
+		_tmp14_ = _tmp13_;
 #line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp16_ = category_name;
+		_tmp15_ = category_name;
 #line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp17_ = g_strconcat (_tmp15_, _tmp16_, NULL);
+		_tmp16_ = g_strconcat (_tmp14_, _tmp15_, NULL);
 #line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (search_name);
 #line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		search_name = _tmp17_;
+		search_name = _tmp16_;
 #line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_free0 (_tmp15_);
+		_g_free0 (_tmp14_);
 #line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_publishing_piwigo_category_unref0 (_tmp12_);
-#line 9495 "PiwigoPublishing.c"
+		_publishing_piwigo_category_unref0 (_tmp11_);
+#line 10031 "PiwigoPublishing.c"
 	}
 #line 1382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp19_ = self->priv->create_new_radio;
-#line 1382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp20_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_toggle_button_get_type (), GtkToggleButton));
+	_tmp18_ = self->priv->create_new_radio;
 #line 1382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (_tmp20_) {
-#line 9503 "PiwigoPublishing.c"
-		gboolean _tmp21_ = FALSE;
-		const gchar* _tmp22_;
+	if (gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_toggle_button_get_type (), GtkToggleButton))) {
+#line 10037 "PiwigoPublishing.c"
+		gboolean _tmp19_ = FALSE;
+		const gchar* _tmp20_;
 #line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp22_ = category_name;
+		_tmp20_ = category_name;
 #line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		if (g_strcmp0 (_tmp22_, "") == 0) {
+		if (g_strcmp0 (_tmp20_, "") == 0) {
 #line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp21_ = TRUE;
-#line 9512 "PiwigoPublishing.c"
+			_tmp19_ = TRUE;
+#line 10046 "PiwigoPublishing.c"
 		} else {
-			const gchar* _tmp23_;
-			gboolean _tmp24_;
-#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp23_ = search_name;
+			const gchar* _tmp21_;
 #line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp24_ = publishing_piwigo_publishing_options_pane_category_already_exists (self, _tmp23_);
+			_tmp21_ = search_name;
 #line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp21_ = _tmp24_;
-#line 9522 "PiwigoPublishing.c"
+			_tmp19_ = publishing_piwigo_publishing_options_pane_category_already_exists (self, _tmp21_);
+#line 10053 "PiwigoPublishing.c"
 		}
 #line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp18_ = _tmp21_;
-#line 9526 "PiwigoPublishing.c"
+		_tmp17_ = _tmp19_;
+#line 10057 "PiwigoPublishing.c"
 	} else {
 #line 1382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp18_ = FALSE;
-#line 9530 "PiwigoPublishing.c"
+		_tmp17_ = FALSE;
+#line 10061 "PiwigoPublishing.c"
 	}
 #line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp25_ = self->priv->publish_button;
+	_tmp22_ = self->priv->publish_button;
 #line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), !_tmp18_);
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), !_tmp17_);
 #line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (search_name);
 #line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (category_name);
-#line 9540 "PiwigoPublishing.c"
+#line 10071 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_publishing_options_pane_real_on_pane_installed (ShotwellPluginsCommonBuilderPane* base) {
+static void
+publishing_piwigo_publishing_options_pane_real_on_pane_installed (ShotwellPluginsCommonBuilderPane* base)
+{
 	PublishingPiwigoPublishingOptionsPane * self;
 	GtkButton* _tmp0_;
 #line 1391 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9575,190 +10108,190 @@ static void publishing_piwigo_publishing_options_pane_real_on_pane_installed (Sh
 	gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 9565 "PiwigoPublishing.c"
+#line 10098 "PiwigoPublishing.c"
 }
 
 
-static gchar* publishing_piwigo_publishing_options_pane_get_common_comment_if_possible (PublishingPiwigoPiwigoPublisher* publisher) {
+static gchar*
+publishing_piwigo_publishing_options_pane_get_common_comment_if_possible (PublishingPiwigoPiwigoPublisher* publisher)
+{
 	gchar* result = NULL;
 	SpitPublishingPublishable** publishables = NULL;
-	PublishingPiwigoPiwigoPublisher* _tmp0_;
+	SpitPublishingPluginHost* _tmp0_;
 	SpitPublishingPluginHost* _tmp1_;
-	SpitPublishingPluginHost* _tmp2_;
-	gint _tmp3_;
+	gint _tmp2_;
+	SpitPublishingPublishable** _tmp3_;
 	SpitPublishingPublishable** _tmp4_;
-	SpitPublishingPublishable** _tmp5_;
-	gint _tmp5__length1;
+	gint _tmp4__length1;
 	gint publishables_length1;
 	gint _publishables_size_;
 	gchar* common = NULL;
-	gchar* _tmp6_;
+	gchar* _tmp5_;
 	gboolean isfirst = FALSE;
-	SpitPublishingPublishable** _tmp7_;
-	gint _tmp7__length1;
-	const gchar* _tmp19_;
+	SpitPublishingPublishable** _tmp6_;
+	gint _tmp6__length1;
+	const gchar* _tmp18_;
 #line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (publisher), NULL);
 #line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = publisher;
+	_tmp0_ = publishing_piwigo_piwigo_publisher_get_host (publisher);
 #line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = publishing_piwigo_piwigo_publisher_get_host (_tmp0_);
-#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp4_ = spit_publishing_plugin_host_get_publishables (_tmp2_, &_tmp3_);
+	_tmp3_ = spit_publishing_plugin_host_get_publishables (_tmp1_, &_tmp2_);
 #line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp5_ = _tmp4_;
+	_tmp4_ = _tmp3_;
 #line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp5__length1 = _tmp3_;
+	_tmp4__length1 = _tmp2_;
 #line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_object_unref0 (_tmp2_);
+	_g_object_unref0 (_tmp1_);
 #line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	publishables = _tmp5_;
+	publishables = _tmp4_;
 #line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	publishables_length1 = _tmp5__length1;
+	publishables_length1 = _tmp4__length1;
 #line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishables_size_ = publishables_length1;
 #line 1407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp6_ = g_strdup ("");
+	_tmp5_ = g_strdup ("");
 #line 1407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	common = _tmp6_;
+	common = _tmp5_;
 #line 1408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	isfirst = TRUE;
 #line 1409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp7_ = publishables;
+	_tmp6_ = publishables;
 #line 1409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp7__length1 = publishables_length1;
+	_tmp6__length1 = publishables_length1;
 #line 1409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (_tmp7_ != NULL) {
-#line 9621 "PiwigoPublishing.c"
-		SpitPublishingPublishable** _tmp8_;
-		gint _tmp8__length1;
+	if (_tmp6_ != NULL) {
+#line 10153 "PiwigoPublishing.c"
+		SpitPublishingPublishable** _tmp7_;
+		gint _tmp7__length1;
 #line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp8_ = publishables;
+		_tmp7_ = publishables;
 #line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp8__length1 = publishables_length1;
-#line 9628 "PiwigoPublishing.c"
+		_tmp7__length1 = publishables_length1;
+#line 10160 "PiwigoPublishing.c"
 		{
 			SpitPublishingPublishable** pub_collection = NULL;
 			gint pub_collection_length1 = 0;
 			gint _pub_collection_size_ = 0;
 			gint pub_it = 0;
 #line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			pub_collection = _tmp8_;
+			pub_collection = _tmp7_;
 #line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			pub_collection_length1 = _tmp8__length1;
+			pub_collection_length1 = _tmp7__length1;
 #line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			for (pub_it = 0; pub_it < _tmp8__length1; pub_it = pub_it + 1) {
-#line 9640 "PiwigoPublishing.c"
-				SpitPublishingPublishable* _tmp9_;
+			for (pub_it = 0; pub_it < _tmp7__length1; pub_it = pub_it + 1) {
+#line 10172 "PiwigoPublishing.c"
+				SpitPublishingPublishable* _tmp8_;
 				SpitPublishingPublishable* pub = NULL;
 #line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp9_ = _g_object_ref0 (pub_collection[pub_it]);
+				_tmp8_ = _g_object_ref0 (pub_collection[pub_it]);
 #line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				pub = _tmp9_;
-#line 9647 "PiwigoPublishing.c"
+				pub = _tmp8_;
+#line 10179 "PiwigoPublishing.c"
 				{
 					gchar* cur = NULL;
-					SpitPublishingPublishable* _tmp10_;
-					gchar* _tmp11_;
-					const gchar* _tmp12_;
-					gboolean _tmp13_;
+					SpitPublishingPublishable* _tmp9_;
+					gchar* _tmp10_;
+					const gchar* _tmp11_;
+					gboolean _tmp12_;
 #line 1411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp10_ = pub;
+					_tmp9_ = pub;
 #line 1411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp11_ = spit_publishing_publishable_get_param_string (_tmp10_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_EVENTCOMMENT);
+					_tmp10_ = spit_publishing_publishable_get_param_string (_tmp9_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_EVENTCOMMENT);
 #line 1411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					cur = _tmp11_;
+					cur = _tmp10_;
 #line 1413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp12_ = cur;
+					_tmp11_ = cur;
 #line 1413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					if (_tmp12_ == NULL) {
+					if (_tmp11_ == NULL) {
 #line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						_g_free0 (cur);
 #line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						_g_object_unref0 (pub);
 #line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						continue;
-#line 9670 "PiwigoPublishing.c"
+#line 10202 "PiwigoPublishing.c"
 					}
 #line 1417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp13_ = isfirst;
+					_tmp12_ = isfirst;
 #line 1417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					if (_tmp13_) {
-#line 9676 "PiwigoPublishing.c"
-						const gchar* _tmp14_;
-						gchar* _tmp15_;
+					if (_tmp12_) {
+#line 10208 "PiwigoPublishing.c"
+						const gchar* _tmp13_;
+						gchar* _tmp14_;
 #line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-						_tmp14_ = cur;
+						_tmp13_ = cur;
 #line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-						_tmp15_ = g_strdup (_tmp14_);
+						_tmp14_ = g_strdup (_tmp13_);
 #line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						_g_free0 (common);
 #line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-						common = _tmp15_;
+						common = _tmp14_;
 #line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						isfirst = FALSE;
-#line 9689 "PiwigoPublishing.c"
+#line 10221 "PiwigoPublishing.c"
 					} else {
+						const gchar* _tmp15_;
 						const gchar* _tmp16_;
-						const gchar* _tmp17_;
 #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-						_tmp16_ = cur;
+						_tmp15_ = cur;
 #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-						_tmp17_ = common;
+						_tmp16_ = common;
 #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-						if (g_strcmp0 (_tmp16_, _tmp17_) != 0) {
-#line 9699 "PiwigoPublishing.c"
-							gchar* _tmp18_;
+						if (g_strcmp0 (_tmp15_, _tmp16_) != 0) {
+#line 10231 "PiwigoPublishing.c"
+							gchar* _tmp17_;
 #line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-							_tmp18_ = g_strdup ("");
+							_tmp17_ = g_strdup ("");
 #line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 							_g_free0 (common);
 #line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-							common = _tmp18_;
+							common = _tmp17_;
 #line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 							_g_free0 (cur);
 #line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 							_g_object_unref0 (pub);
 #line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 							break;
-#line 9713 "PiwigoPublishing.c"
+#line 10245 "PiwigoPublishing.c"
 						}
 					}
 #line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_free0 (cur);
 #line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_object_unref0 (pub);
-#line 9720 "PiwigoPublishing.c"
+#line 10252 "PiwigoPublishing.c"
 				}
 			}
 		}
 	}
 #line 1428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp19_ = common;
+	_tmp18_ = common;
 #line 1428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_debug ("PiwigoPublishing.vala:1428: PiwigoConnector: found common event commen" \
-"t %s\n", _tmp19_);
+"t %s\n", _tmp18_);
 #line 1429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = common;
 #line 1429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 1429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 9735 "PiwigoPublishing.c"
+#line 10267 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_publishing_options_pane_create_categories_combo (PublishingPiwigoPublishingOptionsPane* self) {
+static void
+publishing_piwigo_publishing_options_pane_create_categories_combo (PublishingPiwigoPublishingOptionsPane* self)
+{
 	GeeList* _tmp14_;
 	gboolean _tmp15_;
 	gboolean _tmp16_;
-	const gchar* _tmp30_;
-	gboolean _tmp31_;
+	const gchar* _tmp29_;
 #line 1432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 9747 "PiwigoPublishing.c"
+#line 10280 "PiwigoPublishing.c"
 	{
 		GeeList* _cat_list = NULL;
 		GeeList* _tmp0_;
@@ -9786,7 +10319,7 @@ static void publishing_piwigo_publishing_options_pane_create_categories_combo (P
 		_cat_index = -1;
 #line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		while (TRUE) {
-#line 9775 "PiwigoPublishing.c"
+#line 10308 "PiwigoPublishing.c"
 			gint _tmp5_;
 			gint _tmp6_;
 			gint _tmp7_;
@@ -9809,7 +10342,7 @@ static void publishing_piwigo_publishing_options_pane_create_categories_combo (P
 			if (!(_tmp6_ < _tmp7_)) {
 #line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				break;
-#line 9798 "PiwigoPublishing.c"
+#line 10331 "PiwigoPublishing.c"
 			}
 #line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp8_ = _cat_list;
@@ -9829,11 +10362,11 @@ static void publishing_piwigo_publishing_options_pane_create_categories_combo (P
 			gtk_combo_box_text_append_text (_tmp11_, _tmp13_);
 #line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_piwigo_category_unref0 (cat);
-#line 9818 "PiwigoPublishing.c"
+#line 10351 "PiwigoPublishing.c"
 		}
 #line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_object_unref0 (_cat_list);
-#line 9822 "PiwigoPublishing.c"
+#line 10355 "PiwigoPublishing.c"
 	}
 #line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp14_ = self->priv->_existing_categories;
@@ -9843,7 +10376,7 @@ static void publishing_piwigo_publishing_options_pane_create_categories_combo (P
 	_tmp16_ = _tmp15_;
 #line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp16_) {
-#line 9832 "PiwigoPublishing.c"
+#line 10365 "PiwigoPublishing.c"
 		GtkComboBoxText* _tmp17_;
 		GtkRadioButton* _tmp18_;
 		GtkRadioButton* _tmp19_;
@@ -9874,63 +10407,60 @@ static void publishing_piwigo_publishing_options_pane_create_categories_combo (P
 		_tmp22_ = self->priv->new_category_entry;
 #line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget));
-#line 9863 "PiwigoPublishing.c"
+#line 10396 "PiwigoPublishing.c"
 	} else {
 		gint last_category_index = 0;
 		gint _tmp23_;
-		gint _tmp24_;
-		GtkComboBoxText* _tmp25_;
-		gint _tmp26_;
-		GtkEntry* _tmp27_;
-		GtkTextView* _tmp28_;
-		GtkLabel* _tmp29_;
+		GtkComboBoxText* _tmp24_;
+		gint _tmp25_;
+		GtkEntry* _tmp26_;
+		GtkTextView* _tmp27_;
+		GtkLabel* _tmp28_;
 #line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp23_ = self->priv->_last_category;
 #line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp24_ = publishing_piwigo_publishing_options_pane_find_category_index (self, _tmp23_);
-#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		last_category_index = _tmp24_;
+		last_category_index = publishing_piwigo_publishing_options_pane_find_category_index (self, _tmp23_);
 #line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp25_ = self->priv->existing_categories_combo;
+		_tmp24_ = self->priv->existing_categories_combo;
 #line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp26_ = last_category_index;
+		_tmp25_ = last_category_index;
 #line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_combo_box_get_type (), GtkComboBox), _tmp26_);
+		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_combo_box_get_type (), GtkComboBox), _tmp25_);
 #line 1447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp27_ = self->priv->new_category_entry;
+		_tmp26_ = self->priv->new_category_entry;
 #line 1447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), FALSE);
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 1448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp28_ = self->priv->album_comment;
+		_tmp27_ = self->priv->album_comment;
 #line 1448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), FALSE);
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 1449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp29_ = self->priv->album_comment_label;
+		_tmp28_ = self->priv->album_comment_label;
 #line 1449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 9897 "PiwigoPublishing.c"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 10427 "PiwigoPublishing.c"
 	}
 #line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp30_ = publishing_piwigo_publishing_options_pane_DEFAULT_CATEGORY_NAME;
+	_tmp29_ = publishing_piwigo_publishing_options_pane_DEFAULT_CATEGORY_NAME;
 #line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp31_ = publishing_piwigo_publishing_options_pane_category_already_exists (self, _tmp30_);
-#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (!_tmp31_) {
-#line 9905 "PiwigoPublishing.c"
-		GtkEntry* _tmp32_;
-		const gchar* _tmp33_;
+	if (!publishing_piwigo_publishing_options_pane_category_already_exists (self, _tmp29_)) {
+#line 10433 "PiwigoPublishing.c"
+		GtkEntry* _tmp30_;
+		const gchar* _tmp31_;
 #line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp32_ = self->priv->new_category_entry;
+		_tmp30_ = self->priv->new_category_entry;
 #line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp33_ = publishing_piwigo_publishing_options_pane_DEFAULT_CATEGORY_NAME;
+		_tmp31_ = publishing_piwigo_publishing_options_pane_DEFAULT_CATEGORY_NAME;
 #line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		gtk_entry_set_text (_tmp32_, _tmp33_);
-#line 9914 "PiwigoPublishing.c"
+		gtk_entry_set_text (_tmp30_, _tmp31_);
+#line 10442 "PiwigoPublishing.c"
 	}
 }
 
 
-static void publishing_piwigo_publishing_options_pane_create_within_categories_combo (PublishingPiwigoPublishingOptionsPane* self) {
+static void
+publishing_piwigo_publishing_options_pane_create_within_categories_combo (PublishingPiwigoPublishingOptionsPane* self)
+{
 	GtkComboBoxText* _tmp0_;
 	GtkLabel* _tmp15_;
 	GtkComboBoxText* _tmp16_;
@@ -9941,7 +10471,7 @@ static void publishing_piwigo_publishing_options_pane_create_within_categories_c
 	_tmp0_ = self->priv->within_existing_combo;
 #line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_combo_box_text_append_text (_tmp0_, "/ ");
-#line 9930 "PiwigoPublishing.c"
+#line 10460 "PiwigoPublishing.c"
 	{
 		GeeList* _cat_list = NULL;
 		GeeList* _tmp1_;
@@ -9969,7 +10499,7 @@ static void publishing_piwigo_publishing_options_pane_create_within_categories_c
 		_cat_index = -1;
 #line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		while (TRUE) {
-#line 9958 "PiwigoPublishing.c"
+#line 10488 "PiwigoPublishing.c"
 			gint _tmp6_;
 			gint _tmp7_;
 			gint _tmp8_;
@@ -9992,7 +10522,7 @@ static void publishing_piwigo_publishing_options_pane_create_within_categories_c
 			if (!(_tmp7_ < _tmp8_)) {
 #line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				break;
-#line 9981 "PiwigoPublishing.c"
+#line 10511 "PiwigoPublishing.c"
 			}
 #line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp9_ = _cat_list;
@@ -10012,11 +10542,11 @@ static void publishing_piwigo_publishing_options_pane_create_within_categories_c
 			gtk_combo_box_text_append_text (_tmp12_, _tmp14_);
 #line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_piwigo_category_unref0 (cat);
-#line 10001 "PiwigoPublishing.c"
+#line 10531 "PiwigoPublishing.c"
 		}
 #line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_object_unref0 (_cat_list);
-#line 10005 "PiwigoPublishing.c"
+#line 10535 "PiwigoPublishing.c"
 	}
 #line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp15_ = self->priv->within_existing_label;
@@ -10030,24 +10560,25 @@ static void publishing_piwigo_publishing_options_pane_create_within_categories_c
 	_tmp17_ = self->priv->within_existing_combo;
 #line 1464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 10019 "PiwigoPublishing.c"
+#line 10549 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_publishing_options_pane_create_permissions_combo (PublishingPiwigoPublishingOptionsPane* self) {
+static void
+publishing_piwigo_publishing_options_pane_create_permissions_combo (PublishingPiwigoPublishingOptionsPane* self)
+{
 	PublishingPiwigoPermissionLevel** _tmp0_;
 	gint _tmp0__length1;
 	gint last_permission_level_index = 0;
 	gint _tmp5_;
 	gint _tmp6_;
-	gint _tmp7_;
 #line 1467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->perm_levels;
 #line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0__length1 = self->priv->perm_levels_length1;
-#line 10036 "PiwigoPublishing.c"
+#line 10567 "PiwigoPublishing.c"
 	{
 		PublishingPiwigoPermissionLevel** perm_collection = NULL;
 		gint perm_collection_length1 = 0;
@@ -10059,14 +10590,14 @@ static void publishing_piwigo_publishing_options_pane_create_permissions_combo (
 		perm_collection_length1 = _tmp0__length1;
 #line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		for (perm_it = 0; perm_it < _tmp0__length1; perm_it = perm_it + 1) {
-#line 10048 "PiwigoPublishing.c"
+#line 10579 "PiwigoPublishing.c"
 			PublishingPiwigoPermissionLevel* _tmp1_;
 			PublishingPiwigoPermissionLevel* perm = NULL;
 #line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp1_ = _publishing_piwigo_permission_level_ref0 (perm_collection[perm_it]);
 #line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			perm = _tmp1_;
-#line 10055 "PiwigoPublishing.c"
+#line 10586 "PiwigoPublishing.c"
 			{
 				GtkComboBoxText* _tmp2_;
 				PublishingPiwigoPermissionLevel* _tmp3_;
@@ -10081,55 +10612,54 @@ static void publishing_piwigo_publishing_options_pane_create_permissions_combo (
 				gtk_combo_box_text_append_text (_tmp2_, _tmp4_);
 #line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_publishing_piwigo_permission_level_unref0 (perm);
-#line 10070 "PiwigoPublishing.c"
+#line 10601 "PiwigoPublishing.c"
 			}
 		}
 	}
 #line 1471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = self->priv->_last_permission_level;
 #line 1471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp6_ = publishing_piwigo_publishing_options_pane_find_permission_level_index (self, _tmp5_);
-#line 1471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	last_permission_level_index = _tmp6_;
+	last_permission_level_index = publishing_piwigo_publishing_options_pane_find_permission_level_index (self, _tmp5_);
 #line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp7_ = last_permission_level_index;
+	_tmp6_ = last_permission_level_index;
 #line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (_tmp7_ < 0) {
-#line 10084 "PiwigoPublishing.c"
-		GtkComboBoxText* _tmp8_;
+	if (_tmp6_ < 0) {
+#line 10613 "PiwigoPublishing.c"
+		GtkComboBoxText* _tmp7_;
 #line 1473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp8_ = self->priv->perms_combo;
+		_tmp7_ = self->priv->perms_combo;
 #line 1473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 10090 "PiwigoPublishing.c"
+		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_combo_box_get_type (), GtkComboBox), 0);
+#line 10619 "PiwigoPublishing.c"
 	} else {
-		GtkComboBoxText* _tmp9_;
-		gint _tmp10_;
+		GtkComboBoxText* _tmp8_;
+		gint _tmp9_;
 #line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp9_ = self->priv->perms_combo;
+		_tmp8_ = self->priv->perms_combo;
 #line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp10_ = last_permission_level_index;
+		_tmp9_ = last_permission_level_index;
 #line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_combo_box_get_type (), GtkComboBox), _tmp10_);
-#line 10100 "PiwigoPublishing.c"
+		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), _tmp9_);
+#line 10629 "PiwigoPublishing.c"
 	}
 }
 
 
-static void publishing_piwigo_publishing_options_pane_create_size_combo (PublishingPiwigoPublishingOptionsPane* self) {
+static void
+publishing_piwigo_publishing_options_pane_create_size_combo (PublishingPiwigoPublishingOptionsPane* self)
+{
 	PublishingPiwigoSizeEntry** _tmp0_;
 	gint _tmp0__length1;
 	gint last_size_index = 0;
 	gint _tmp5_;
 	gint _tmp6_;
-	gint _tmp7_;
 #line 1479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->photo_sizes;
 #line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0__length1 = self->priv->photo_sizes_length1;
-#line 10118 "PiwigoPublishing.c"
+#line 10648 "PiwigoPublishing.c"
 	{
 		PublishingPiwigoSizeEntry** size_collection = NULL;
 		gint size_collection_length1 = 0;
@@ -10141,14 +10671,14 @@ static void publishing_piwigo_publishing_options_pane_create_size_combo (Publish
 		size_collection_length1 = _tmp0__length1;
 #line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		for (size_it = 0; size_it < _tmp0__length1; size_it = size_it + 1) {
-#line 10130 "PiwigoPublishing.c"
+#line 10660 "PiwigoPublishing.c"
 			PublishingPiwigoSizeEntry* _tmp1_;
 			PublishingPiwigoSizeEntry* size = NULL;
 #line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp1_ = _publishing_piwigo_size_entry_ref0 (size_collection[size_it]);
 #line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			size = _tmp1_;
-#line 10137 "PiwigoPublishing.c"
+#line 10667 "PiwigoPublishing.c"
 			{
 				GtkComboBoxText* _tmp2_;
 				PublishingPiwigoSizeEntry* _tmp3_;
@@ -10163,64 +10693,62 @@ static void publishing_piwigo_publishing_options_pane_create_size_combo (Publish
 				gtk_combo_box_text_append_text (_tmp2_, _tmp4_);
 #line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_publishing_piwigo_size_entry_unref0 (size);
-#line 10152 "PiwigoPublishing.c"
+#line 10682 "PiwigoPublishing.c"
 			}
 		}
 	}
 #line 1483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = self->priv->_last_photo_size;
 #line 1483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp6_ = publishing_piwigo_publishing_options_pane_find_size_index (self, _tmp5_);
-#line 1483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	last_size_index = _tmp6_;
+	last_size_index = publishing_piwigo_publishing_options_pane_find_size_index (self, _tmp5_);
 #line 1484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp7_ = last_size_index;
+	_tmp6_ = last_size_index;
 #line 1484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (_tmp7_ < 0) {
-#line 10166 "PiwigoPublishing.c"
-		GtkComboBoxText* _tmp8_;
-		gint _tmp9_;
-#line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp8_ = self->priv->size_combo;
+	if (_tmp6_ < 0) {
+#line 10694 "PiwigoPublishing.c"
+		GtkComboBoxText* _tmp7_;
 #line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp9_ = publishing_piwigo_publishing_options_pane_find_size_index (self, PUBLISHING_PIWIGO_ORIGINAL_SIZE);
+		_tmp7_ = self->priv->size_combo;
 #line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), _tmp9_);
-#line 10175 "PiwigoPublishing.c"
+		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_combo_box_get_type (), GtkComboBox), publishing_piwigo_publishing_options_pane_find_size_index (self, PUBLISHING_PIWIGO_ORIGINAL_SIZE));
+#line 10700 "PiwigoPublishing.c"
 	} else {
-		GtkComboBoxText* _tmp10_;
-		gint _tmp11_;
+		GtkComboBoxText* _tmp8_;
+		gint _tmp9_;
 #line 1487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp10_ = self->priv->size_combo;
+		_tmp8_ = self->priv->size_combo;
 #line 1487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp11_ = last_size_index;
+		_tmp9_ = last_size_index;
 #line 1487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_combo_box_get_type (), GtkComboBox), _tmp11_);
-#line 10185 "PiwigoPublishing.c"
+		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), _tmp9_);
+#line 10710 "PiwigoPublishing.c"
 	}
 }
 
 
-static gint publishing_piwigo_publishing_options_pane_find_category_index (PublishingPiwigoPublishingOptionsPane* self, gint category_id) {
+static gint
+publishing_piwigo_publishing_options_pane_find_category_index (PublishingPiwigoPublishingOptionsPane* self,
+                                                               gint category_id)
+{
 	gint result = 0;
 	gint _result_ = 0;
 #line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), 0);
 #line 1492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_result_ = 0;
-#line 10197 "PiwigoPublishing.c"
+#line 10725 "PiwigoPublishing.c"
 	{
 		gint i = 0;
 #line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		i = 0;
-#line 10202 "PiwigoPublishing.c"
+#line 10730 "PiwigoPublishing.c"
 		{
 			gboolean _tmp0_ = FALSE;
 #line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp0_ = TRUE;
 #line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			while (TRUE) {
-#line 10209 "PiwigoPublishing.c"
+#line 10737 "PiwigoPublishing.c"
 				gint _tmp2_;
 				GeeList* _tmp3_;
 				gint _tmp4_;
@@ -10230,17 +10758,16 @@ static gint publishing_piwigo_publishing_options_pane_find_category_index (Publi
 				gpointer _tmp8_;
 				PublishingPiwigoCategory* _tmp9_;
 				gint _tmp10_;
-				gint _tmp11_;
-				gboolean _tmp12_;
+				gboolean _tmp11_;
 #line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (!_tmp0_) {
-#line 10223 "PiwigoPublishing.c"
+#line 10750 "PiwigoPublishing.c"
 					gint _tmp1_;
 #line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp1_ = i;
 #line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					i = _tmp1_ + 1;
-#line 10229 "PiwigoPublishing.c"
+#line 10756 "PiwigoPublishing.c"
 				}
 #line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp0_ = FALSE;
@@ -10256,7 +10783,7 @@ static gint publishing_piwigo_publishing_options_pane_find_category_index (Publi
 				if (!(_tmp2_ < _tmp5_)) {
 #line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					break;
-#line 10245 "PiwigoPublishing.c"
+#line 10772 "PiwigoPublishing.c"
 				}
 #line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp6_ = self->priv->_existing_categories;
@@ -10269,22 +10796,20 @@ static gint publishing_piwigo_publishing_options_pane_find_category_index (Publi
 #line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp10_ = _tmp9_->id;
 #line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp11_ = category_id;
-#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp12_ = _tmp10_ == _tmp11_;
+				_tmp11_ = _tmp10_ == category_id;
 #line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_publishing_piwigo_category_unref0 (_tmp9_);
 #line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				if (_tmp12_) {
-#line 10265 "PiwigoPublishing.c"
-					gint _tmp13_;
+				if (_tmp11_) {
+#line 10790 "PiwigoPublishing.c"
+					gint _tmp12_;
 #line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp13_ = i;
+					_tmp12_ = i;
 #line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_result_ = _tmp13_;
+					_result_ = _tmp12_;
 #line 1496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					break;
-#line 10273 "PiwigoPublishing.c"
+#line 10798 "PiwigoPublishing.c"
 				}
 			}
 		}
@@ -10293,30 +10818,33 @@ static gint publishing_piwigo_publishing_options_pane_find_category_index (Publi
 	result = _result_;
 #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 10282 "PiwigoPublishing.c"
+#line 10807 "PiwigoPublishing.c"
 }
 
 
-static gint publishing_piwigo_publishing_options_pane_find_permission_level_index (PublishingPiwigoPublishingOptionsPane* self, gint permission_level_id) {
+static gint
+publishing_piwigo_publishing_options_pane_find_permission_level_index (PublishingPiwigoPublishingOptionsPane* self,
+                                                                       gint permission_level_id)
+{
 	gint result = 0;
 	gint _result_ = 0;
 #line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), 0);
 #line 1503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_result_ = -1;
-#line 10293 "PiwigoPublishing.c"
+#line 10821 "PiwigoPublishing.c"
 	{
 		gint i = 0;
 #line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		i = 0;
-#line 10298 "PiwigoPublishing.c"
+#line 10826 "PiwigoPublishing.c"
 		{
 			gboolean _tmp0_ = FALSE;
 #line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp0_ = TRUE;
 #line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			while (TRUE) {
-#line 10305 "PiwigoPublishing.c"
+#line 10833 "PiwigoPublishing.c"
 				gint _tmp2_;
 				PublishingPiwigoPermissionLevel** _tmp3_;
 				gint _tmp3__length1;
@@ -10325,16 +10853,15 @@ static gint publishing_piwigo_publishing_options_pane_find_permission_level_inde
 				gint _tmp5_;
 				PublishingPiwigoPermissionLevel* _tmp6_;
 				gint _tmp7_;
-				gint _tmp8_;
 #line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (!_tmp0_) {
-#line 10317 "PiwigoPublishing.c"
+#line 10844 "PiwigoPublishing.c"
 					gint _tmp1_;
 #line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp1_ = i;
 #line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					i = _tmp1_ + 1;
-#line 10323 "PiwigoPublishing.c"
+#line 10850 "PiwigoPublishing.c"
 				}
 #line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp0_ = FALSE;
@@ -10348,7 +10875,7 @@ static gint publishing_piwigo_publishing_options_pane_find_permission_level_inde
 				if (!(_tmp2_ < _tmp3__length1)) {
 #line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					break;
-#line 10337 "PiwigoPublishing.c"
+#line 10864 "PiwigoPublishing.c"
 				}
 #line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp4_ = self->priv->perm_levels;
@@ -10361,18 +10888,16 @@ static gint publishing_piwigo_publishing_options_pane_find_permission_level_inde
 #line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp7_ = _tmp6_->id;
 #line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp8_ = permission_level_id;
-#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				if (_tmp7_ == _tmp8_) {
-#line 10353 "PiwigoPublishing.c"
-					gint _tmp9_;
+				if (_tmp7_ == permission_level_id) {
+#line 10878 "PiwigoPublishing.c"
+					gint _tmp8_;
 #line 1506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp9_ = i;
+					_tmp8_ = i;
 #line 1506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_result_ = _tmp9_;
+					_result_ = _tmp8_;
 #line 1507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					break;
-#line 10361 "PiwigoPublishing.c"
+#line 10886 "PiwigoPublishing.c"
 				}
 			}
 		}
@@ -10381,30 +10906,33 @@ static gint publishing_piwigo_publishing_options_pane_find_permission_level_inde
 	result = _result_;
 #line 1510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 10370 "PiwigoPublishing.c"
+#line 10895 "PiwigoPublishing.c"
 }
 
 
-static gint publishing_piwigo_publishing_options_pane_find_size_index (PublishingPiwigoPublishingOptionsPane* self, gint size_id) {
+static gint
+publishing_piwigo_publishing_options_pane_find_size_index (PublishingPiwigoPublishingOptionsPane* self,
+                                                           gint size_id)
+{
 	gint result = 0;
 	gint _result_ = 0;
 #line 1513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), 0);
 #line 1514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_result_ = -1;
-#line 10381 "PiwigoPublishing.c"
+#line 10909 "PiwigoPublishing.c"
 	{
 		gint i = 0;
 #line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		i = 0;
-#line 10386 "PiwigoPublishing.c"
+#line 10914 "PiwigoPublishing.c"
 		{
 			gboolean _tmp0_ = FALSE;
 #line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp0_ = TRUE;
 #line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			while (TRUE) {
-#line 10393 "PiwigoPublishing.c"
+#line 10921 "PiwigoPublishing.c"
 				gint _tmp2_;
 				PublishingPiwigoSizeEntry** _tmp3_;
 				gint _tmp3__length1;
@@ -10413,16 +10941,15 @@ static gint publishing_piwigo_publishing_options_pane_find_size_index (Publishin
 				gint _tmp5_;
 				PublishingPiwigoSizeEntry* _tmp6_;
 				gint _tmp7_;
-				gint _tmp8_;
 #line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (!_tmp0_) {
-#line 10405 "PiwigoPublishing.c"
+#line 10932 "PiwigoPublishing.c"
 					gint _tmp1_;
 #line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp1_ = i;
 #line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					i = _tmp1_ + 1;
-#line 10411 "PiwigoPublishing.c"
+#line 10938 "PiwigoPublishing.c"
 				}
 #line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp0_ = FALSE;
@@ -10436,7 +10963,7 @@ static gint publishing_piwigo_publishing_options_pane_find_size_index (Publishin
 				if (!(_tmp2_ < _tmp3__length1)) {
 #line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					break;
-#line 10425 "PiwigoPublishing.c"
+#line 10952 "PiwigoPublishing.c"
 				}
 #line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp4_ = self->priv->photo_sizes;
@@ -10449,18 +10976,16 @@ static gint publishing_piwigo_publishing_options_pane_find_size_index (Publishin
 #line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp7_ = _tmp6_->id;
 #line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp8_ = size_id;
-#line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				if (_tmp7_ == _tmp8_) {
-#line 10441 "PiwigoPublishing.c"
-					gint _tmp9_;
+				if (_tmp7_ == size_id) {
+#line 10966 "PiwigoPublishing.c"
+					gint _tmp8_;
 #line 1517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp9_ = i;
+					_tmp8_ = i;
 #line 1517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_result_ = _tmp9_;
+					_result_ = _tmp8_;
 #line 1518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					break;
-#line 10449 "PiwigoPublishing.c"
+#line 10974 "PiwigoPublishing.c"
 				}
 			}
 		}
@@ -10469,11 +10994,14 @@ static gint publishing_piwigo_publishing_options_pane_find_size_index (Publishin
 	result = _result_;
 #line 1521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 10458 "PiwigoPublishing.c"
+#line 10983 "PiwigoPublishing.c"
 }
 
 
-static gboolean publishing_piwigo_publishing_options_pane_category_already_exists (PublishingPiwigoPublishingOptionsPane* self, const gchar* category_name) {
+static gboolean
+publishing_piwigo_publishing_options_pane_category_already_exists (PublishingPiwigoPublishingOptionsPane* self,
+                                                                   const gchar* category_name)
+{
 	gboolean result = FALSE;
 	gboolean _result_ = FALSE;
 #line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -10482,7 +11010,7 @@ static gboolean publishing_piwigo_publishing_options_pane_category_already_exist
 	g_return_val_if_fail (category_name != NULL, FALSE);
 #line 1525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_result_ = FALSE;
-#line 10471 "PiwigoPublishing.c"
+#line 10999 "PiwigoPublishing.c"
 	{
 		GeeList* _category_list = NULL;
 		GeeList* _tmp0_;
@@ -10510,7 +11038,7 @@ static gboolean publishing_piwigo_publishing_options_pane_category_already_exist
 		_category_index = -1;
 #line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		while (TRUE) {
-#line 10499 "PiwigoPublishing.c"
+#line 11027 "PiwigoPublishing.c"
 			gint _tmp5_;
 			gint _tmp6_;
 			gint _tmp7_;
@@ -10522,8 +11050,7 @@ static gboolean publishing_piwigo_publishing_options_pane_category_already_exist
 			const gchar* _tmp12_;
 			gchar* _tmp13_;
 			gchar* _tmp14_;
-			const gchar* _tmp15_;
-			gboolean _tmp16_;
+			gboolean _tmp15_;
 #line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp5_ = _category_index;
 #line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -10536,7 +11063,7 @@ static gboolean publishing_piwigo_publishing_options_pane_category_already_exist
 			if (!(_tmp6_ < _tmp7_)) {
 #line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				break;
-#line 10525 "PiwigoPublishing.c"
+#line 11052 "PiwigoPublishing.c"
 			}
 #line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp8_ = _category_list;
@@ -10555,38 +11082,38 @@ static gboolean publishing_piwigo_publishing_options_pane_category_already_exist
 #line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp14_ = _tmp13_;
 #line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp15_ = category_name;
-#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp16_ = g_strcmp0 (_tmp14_, _tmp15_) == 0;
+			_tmp15_ = g_strcmp0 (_tmp14_, category_name) == 0;
 #line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_free0 (_tmp14_);
 #line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			if (_tmp16_) {
+			if (_tmp15_) {
 #line 1528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_result_ = TRUE;
 #line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_publishing_piwigo_category_unref0 (category);
 #line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				break;
-#line 10557 "PiwigoPublishing.c"
+#line 11082 "PiwigoPublishing.c"
 			}
 #line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_piwigo_category_unref0 (category);
-#line 10561 "PiwigoPublishing.c"
+#line 11086 "PiwigoPublishing.c"
 		}
 #line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_object_unref0 (_category_list);
-#line 10565 "PiwigoPublishing.c"
+#line 11090 "PiwigoPublishing.c"
 	}
 #line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _result_;
 #line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 10571 "PiwigoPublishing.c"
+#line 11096 "PiwigoPublishing.c"
 }
 
 
-static gint publishing_piwigo_publishing_options_pane_get_last_category (PublishingPiwigoPublishingOptionsPane* self) {
+static gint
+publishing_piwigo_publishing_options_pane_get_last_category (PublishingPiwigoPublishingOptionsPane* self)
+{
 	gint result;
 	gint _tmp0_;
 #line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -10597,29 +11124,30 @@ static gint publishing_piwigo_publishing_options_pane_get_last_category (Publish
 	result = _tmp0_;
 #line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 10586 "PiwigoPublishing.c"
+#line 11113 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_publishing_options_pane_set_last_category (PublishingPiwigoPublishingOptionsPane* self, gint value) {
+static void
+publishing_piwigo_publishing_options_pane_set_last_category (PublishingPiwigoPublishingOptionsPane* self,
+                                                             gint value)
+{
 #line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (publishing_piwigo_publishing_options_pane_get_last_category (self) != value) {
-#line 10595 "PiwigoPublishing.c"
-		gint _tmp0_;
 #line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp0_ = value;
+		self->priv->_last_category = value;
 #line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		self->priv->_last_category = _tmp0_;
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_object_notify ((GObject *) self, "last-category");
-#line 10603 "PiwigoPublishing.c"
+		g_object_notify_by_pspec ((GObject *) self, publishing_piwigo_publishing_options_pane_properties[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_CATEGORY_PROPERTY]);
+#line 11129 "PiwigoPublishing.c"
 	}
 }
 
 
-static gint publishing_piwigo_publishing_options_pane_get_last_permission_level (PublishingPiwigoPublishingOptionsPane* self) {
+static gint
+publishing_piwigo_publishing_options_pane_get_last_permission_level (PublishingPiwigoPublishingOptionsPane* self)
+{
 	gint result;
 	gint _tmp0_;
 #line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -10630,29 +11158,30 @@ static gint publishing_piwigo_publishing_options_pane_get_last_permission_level
 	result = _tmp0_;
 #line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 10619 "PiwigoPublishing.c"
+#line 11147 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_publishing_options_pane_set_last_permission_level (PublishingPiwigoPublishingOptionsPane* self, gint value) {
+static void
+publishing_piwigo_publishing_options_pane_set_last_permission_level (PublishingPiwigoPublishingOptionsPane* self,
+                                                                     gint value)
+{
 #line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (publishing_piwigo_publishing_options_pane_get_last_permission_level (self) != value) {
-#line 10628 "PiwigoPublishing.c"
-		gint _tmp0_;
 #line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp0_ = value;
+		self->priv->_last_permission_level = value;
 #line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		self->priv->_last_permission_level = _tmp0_;
-#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_object_notify ((GObject *) self, "last-permission-level");
-#line 10636 "PiwigoPublishing.c"
+		g_object_notify_by_pspec ((GObject *) self, publishing_piwigo_publishing_options_pane_properties[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PERMISSION_LEVEL_PROPERTY]);
+#line 11163 "PiwigoPublishing.c"
 	}
 }
 
 
-static gint publishing_piwigo_publishing_options_pane_get_last_photo_size (PublishingPiwigoPublishingOptionsPane* self) {
+static gint
+publishing_piwigo_publishing_options_pane_get_last_photo_size (PublishingPiwigoPublishingOptionsPane* self)
+{
 	gint result;
 	gint _tmp0_;
 #line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -10663,29 +11192,30 @@ static gint publishing_piwigo_publishing_options_pane_get_last_photo_size (Publi
 	result = _tmp0_;
 #line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 10652 "PiwigoPublishing.c"
+#line 11181 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_publishing_options_pane_set_last_photo_size (PublishingPiwigoPublishingOptionsPane* self, gint value) {
+static void
+publishing_piwigo_publishing_options_pane_set_last_photo_size (PublishingPiwigoPublishingOptionsPane* self,
+                                                               gint value)
+{
 #line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (publishing_piwigo_publishing_options_pane_get_last_photo_size (self) != value) {
-#line 10661 "PiwigoPublishing.c"
-		gint _tmp0_;
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp0_ = value;
 #line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		self->priv->_last_photo_size = _tmp0_;
+		self->priv->_last_photo_size = value;
 #line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_object_notify ((GObject *) self, "last-photo-size");
-#line 10669 "PiwigoPublishing.c"
+		g_object_notify_by_pspec ((GObject *) self, publishing_piwigo_publishing_options_pane_properties[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PHOTO_SIZE_PROPERTY]);
+#line 11197 "PiwigoPublishing.c"
 	}
 }
 
 
-static gboolean publishing_piwigo_publishing_options_pane_get_last_title_as_comment (PublishingPiwigoPublishingOptionsPane* self) {
+static gboolean
+publishing_piwigo_publishing_options_pane_get_last_title_as_comment (PublishingPiwigoPublishingOptionsPane* self)
+{
 	gboolean result;
 	gboolean _tmp0_;
 #line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -10696,29 +11226,30 @@ static gboolean publishing_piwigo_publishing_options_pane_get_last_title_as_comm
 	result = _tmp0_;
 #line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 10685 "PiwigoPublishing.c"
+#line 11215 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_publishing_options_pane_set_last_title_as_comment (PublishingPiwigoPublishingOptionsPane* self, gboolean value) {
+static void
+publishing_piwigo_publishing_options_pane_set_last_title_as_comment (PublishingPiwigoPublishingOptionsPane* self,
+                                                                     gboolean value)
+{
 #line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (publishing_piwigo_publishing_options_pane_get_last_title_as_comment (self) != value) {
-#line 10694 "PiwigoPublishing.c"
-		gboolean _tmp0_;
-#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp0_ = value;
 #line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		self->priv->_last_title_as_comment = _tmp0_;
+		self->priv->_last_title_as_comment = value;
 #line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_object_notify ((GObject *) self, "last-title-as-comment");
-#line 10702 "PiwigoPublishing.c"
+		g_object_notify_by_pspec ((GObject *) self, publishing_piwigo_publishing_options_pane_properties[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_TITLE_AS_COMMENT_PROPERTY]);
+#line 11231 "PiwigoPublishing.c"
 	}
 }
 
 
-static gboolean publishing_piwigo_publishing_options_pane_get_last_no_upload_tags (PublishingPiwigoPublishingOptionsPane* self) {
+static gboolean
+publishing_piwigo_publishing_options_pane_get_last_no_upload_tags (PublishingPiwigoPublishingOptionsPane* self)
+{
 	gboolean result;
 	gboolean _tmp0_;
 #line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -10729,29 +11260,30 @@ static gboolean publishing_piwigo_publishing_options_pane_get_last_no_upload_tag
 	result = _tmp0_;
 #line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 10718 "PiwigoPublishing.c"
+#line 11249 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_publishing_options_pane_set_last_no_upload_tags (PublishingPiwigoPublishingOptionsPane* self, gboolean value) {
+static void
+publishing_piwigo_publishing_options_pane_set_last_no_upload_tags (PublishingPiwigoPublishingOptionsPane* self,
+                                                                   gboolean value)
+{
 #line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (publishing_piwigo_publishing_options_pane_get_last_no_upload_tags (self) != value) {
-#line 10727 "PiwigoPublishing.c"
-		gboolean _tmp0_;
-#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp0_ = value;
 #line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		self->priv->_last_no_upload_tags = _tmp0_;
+		self->priv->_last_no_upload_tags = value;
 #line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_object_notify ((GObject *) self, "last-no-upload-tags");
-#line 10735 "PiwigoPublishing.c"
+		g_object_notify_by_pspec ((GObject *) self, publishing_piwigo_publishing_options_pane_properties[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_NO_UPLOAD_TAGS_PROPERTY]);
+#line 11265 "PiwigoPublishing.c"
 	}
 }
 
 
-static gboolean publishing_piwigo_publishing_options_pane_get_strip_metadata_enabled (PublishingPiwigoPublishingOptionsPane* self) {
+static gboolean
+publishing_piwigo_publishing_options_pane_get_strip_metadata_enabled (PublishingPiwigoPublishingOptionsPane* self)
+{
 	gboolean result;
 	gboolean _tmp0_;
 #line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -10762,29 +11294,30 @@ static gboolean publishing_piwigo_publishing_options_pane_get_strip_metadata_ena
 	result = _tmp0_;
 #line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 10751 "PiwigoPublishing.c"
+#line 11283 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_publishing_options_pane_set_strip_metadata_enabled (PublishingPiwigoPublishingOptionsPane* self, gboolean value) {
+static void
+publishing_piwigo_publishing_options_pane_set_strip_metadata_enabled (PublishingPiwigoPublishingOptionsPane* self,
+                                                                      gboolean value)
+{
 #line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (publishing_piwigo_publishing_options_pane_get_strip_metadata_enabled (self) != value) {
-#line 10760 "PiwigoPublishing.c"
-		gboolean _tmp0_;
-#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp0_ = value;
 #line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		self->priv->_strip_metadata_enabled = _tmp0_;
+		self->priv->_strip_metadata_enabled = value;
 #line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_object_notify ((GObject *) self, "strip-metadata-enabled");
-#line 10768 "PiwigoPublishing.c"
+		g_object_notify_by_pspec ((GObject *) self, publishing_piwigo_publishing_options_pane_properties[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_STRIP_METADATA_ENABLED_PROPERTY]);
+#line 11299 "PiwigoPublishing.c"
 	}
 }
 
 
-static GeeList* publishing_piwigo_publishing_options_pane_get_existing_categories (PublishingPiwigoPublishingOptionsPane* self) {
+static GeeList*
+publishing_piwigo_publishing_options_pane_get_existing_categories (PublishingPiwigoPublishingOptionsPane* self)
+{
 	GeeList* result;
 	GeeList* _tmp0_;
 #line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -10795,34 +11328,36 @@ static GeeList* publishing_piwigo_publishing_options_pane_get_existing_categorie
 	result = _tmp0_;
 #line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 10784 "PiwigoPublishing.c"
+#line 11317 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_publishing_options_pane_set_existing_categories (PublishingPiwigoPublishingOptionsPane* self, GeeList* value) {
+static void
+publishing_piwigo_publishing_options_pane_set_existing_categories (PublishingPiwigoPublishingOptionsPane* self,
+                                                                   GeeList* value)
+{
 #line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (publishing_piwigo_publishing_options_pane_get_existing_categories (self) != value) {
-#line 10793 "PiwigoPublishing.c"
+#line 11329 "PiwigoPublishing.c"
 		GeeList* _tmp0_;
-		GeeList* _tmp1_;
 #line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp0_ = value;
-#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp1_ = _g_object_ref0 (_tmp0_);
+		_tmp0_ = _g_object_ref0 (value);
 #line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_object_unref0 (self->priv->_existing_categories);
 #line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		self->priv->_existing_categories = _tmp1_;
+		self->priv->_existing_categories = _tmp0_;
 #line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_object_notify ((GObject *) self, "existing-categories");
-#line 10806 "PiwigoPublishing.c"
+		g_object_notify_by_pspec ((GObject *) self, publishing_piwigo_publishing_options_pane_properties[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_EXISTING_CATEGORIES_PROPERTY]);
+#line 11339 "PiwigoPublishing.c"
 	}
 }
 
 
-static const gchar* publishing_piwigo_publishing_options_pane_get_default_comment (PublishingPiwigoPublishingOptionsPane* self) {
+static const gchar*
+publishing_piwigo_publishing_options_pane_get_default_comment (PublishingPiwigoPublishingOptionsPane* self)
+{
 	const gchar* result;
 	const gchar* _tmp0_;
 #line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -10833,34 +11368,41 @@ static const gchar* publishing_piwigo_publishing_options_pane_get_default_commen
 	result = _tmp0_;
 #line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 10822 "PiwigoPublishing.c"
+#line 11357 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_publishing_options_pane_set_default_comment (PublishingPiwigoPublishingOptionsPane* self, const gchar* value) {
+static void
+publishing_piwigo_publishing_options_pane_set_default_comment (PublishingPiwigoPublishingOptionsPane* self,
+                                                               const gchar* value)
+{
 #line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (g_strcmp0 (value, publishing_piwigo_publishing_options_pane_get_default_comment (self)) != 0) {
-#line 10831 "PiwigoPublishing.c"
-		const gchar* _tmp0_;
-		gchar* _tmp1_;
+#line 11369 "PiwigoPublishing.c"
+		gchar* _tmp0_;
 #line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp0_ = value;
-#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp1_ = g_strdup (_tmp0_);
+		_tmp0_ = g_strdup (value);
 #line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (self->priv->_default_comment);
 #line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		self->priv->_default_comment = _tmp1_;
+		self->priv->_default_comment = _tmp0_;
 #line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_object_notify ((GObject *) self, "default-comment");
-#line 10844 "PiwigoPublishing.c"
+		g_object_notify_by_pspec ((GObject *) self, publishing_piwigo_publishing_options_pane_properties[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DEFAULT_COMMENT_PROPERTY]);
+#line 11379 "PiwigoPublishing.c"
 	}
 }
 
 
-static void g_cclosure_user_marshal_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+static void
+g_cclosure_user_marshal_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_BOOLEAN (GClosure * closure,
+                                                                               GValue * return_value,
+                                                                               guint n_param_values,
+                                                                               const GValue * param_values,
+                                                                               gpointer invocation_hint,
+                                                                               gpointer marshal_data)
+{
 	typedef void (*GMarshalFunc_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_BOOLEAN) (gpointer data1, gpointer arg_1, gboolean arg_2, gpointer data2);
 	register GMarshalFunc_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_BOOLEAN callback;
 	register GCClosure * cc;
@@ -10875,23 +11417,25 @@ static void g_cclosure_user_marshal_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETER
 		data1 = closure->data;
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 10864 "PiwigoPublishing.c"
+#line 11406 "PiwigoPublishing.c"
 	} else {
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		data2 = closure->data;
-#line 10870 "PiwigoPublishing.c"
+#line 11412 "PiwigoPublishing.c"
 	}
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	callback = (GMarshalFunc_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	callback (data1, publishing_piwigo_value_get_publishing_parameters (param_values + 1), g_value_get_boolean (param_values + 2), data2);
-#line 10876 "PiwigoPublishing.c"
+#line 11418 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_publishing_options_pane_class_init (PublishingPiwigoPublishingOptionsPaneClass * klass) {
+static void
+publishing_piwigo_publishing_options_pane_class_init (PublishingPiwigoPublishingOptionsPaneClass * klass)
+{
 	gchar* _tmp0_;
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_parent_class = g_type_class_peek_parent (klass);
@@ -10908,21 +11452,21 @@ static void publishing_piwigo_publishing_options_pane_class_init (PublishingPiwi
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_piwigo_publishing_options_pane_finalize;
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_CATEGORY_PROPERTY, g_param_spec_int ("last-category", "last-category", "last-category", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_CATEGORY_PROPERTY, publishing_piwigo_publishing_options_pane_properties[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_CATEGORY_PROPERTY] = g_param_spec_int ("last-category", "last-category", "last-category", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PERMISSION_LEVEL_PROPERTY, g_param_spec_int ("last-permission-level", "last-permission-level", "last-permission-level", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PERMISSION_LEVEL_PROPERTY, publishing_piwigo_publishing_options_pane_properties[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PERMISSION_LEVEL_PROPERTY] = g_param_spec_int ("last-permission-level", "last-permission-level", "last-permission-level", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PHOTO_SIZE_PROPERTY, g_param_spec_int ("last-photo-size", "last-photo-size", "last-photo-size", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PHOTO_SIZE_PROPERTY, publishing_piwigo_publishing_options_pane_properties[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PHOTO_SIZE_PROPERTY] = g_param_spec_int ("last-photo-size", "last-photo-size", "last-photo-size", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_TITLE_AS_COMMENT_PROPERTY, g_param_spec_boolean ("last-title-as-comment", "last-title-as-comment", "last-title-as-comment", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_TITLE_AS_COMMENT_PROPERTY, publishing_piwigo_publishing_options_pane_properties[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_TITLE_AS_COMMENT_PROPERTY] = g_param_spec_boolean ("last-title-as-comment", "last-title-as-comment", "last-title-as-comment", FALSE, G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_NO_UPLOAD_TAGS_PROPERTY, g_param_spec_boolean ("last-no-upload-tags", "last-no-upload-tags", "last-no-upload-tags", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_NO_UPLOAD_TAGS_PROPERTY, publishing_piwigo_publishing_options_pane_properties[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_NO_UPLOAD_TAGS_PROPERTY] = g_param_spec_boolean ("last-no-upload-tags", "last-no-upload-tags", "last-no-upload-tags", FALSE, G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_STRIP_METADATA_ENABLED_PROPERTY, g_param_spec_boolean ("strip-metadata-enabled", "strip-metadata-enabled", "strip-metadata-enabled", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_STRIP_METADATA_ENABLED_PROPERTY, publishing_piwigo_publishing_options_pane_properties[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_STRIP_METADATA_ENABLED_PROPERTY] = g_param_spec_boolean ("strip-metadata-enabled", "strip-metadata-enabled", "strip-metadata-enabled", FALSE, G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_EXISTING_CATEGORIES_PROPERTY, g_param_spec_object ("existing-categories", "existing-categories", "existing-categories", GEE_TYPE_LIST, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_EXISTING_CATEGORIES_PROPERTY, publishing_piwigo_publishing_options_pane_properties[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_EXISTING_CATEGORIES_PROPERTY] = g_param_spec_object ("existing-categories", "existing-categories", "existing-categories", GEE_TYPE_LIST, G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DEFAULT_COMMENT_PROPERTY, g_param_spec_string ("default-comment", "default-comment", "default-comment", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DEFAULT_COMMENT_PROPERTY, publishing_piwigo_publishing_options_pane_properties[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DEFAULT_COMMENT_PROPERTY] = g_param_spec_string ("default-comment", "default-comment", "default-comment", NULL, G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_signals[PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL] = g_signal_new ("publish", PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_BOOLEAN, G_TYPE_NONE, 2, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS, G_TYPE_BOOLEAN);
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -10931,11 +11475,13 @@ static void publishing_piwigo_publishing_options_pane_class_init (PublishingPiwi
 	_tmp0_ = g_strdup (_ ("Shotwell Connect"));
 #line 1188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_DEFAULT_CATEGORY_NAME = _tmp0_;
-#line 10920 "PiwigoPublishing.c"
+#line 11464 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_publishing_options_pane_instance_init (PublishingPiwigoPublishingOptionsPane * self) {
+static void
+publishing_piwigo_publishing_options_pane_instance_init (PublishingPiwigoPublishingOptionsPane * self)
+{
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv = PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
 #line 1198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -10944,11 +11490,13 @@ static void publishing_piwigo_publishing_options_pane_instance_init (PublishingP
 	self->priv->title_as_comment_check = NULL;
 #line 1200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->no_upload_tags_check = NULL;
-#line 10933 "PiwigoPublishing.c"
+#line 11479 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_publishing_options_pane_finalize (GObject * obj) {
+static void
+publishing_piwigo_publishing_options_pane_finalize (GObject * obj)
+{
 	PublishingPiwigoPublishingOptionsPane * self;
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPiwigoPublishingOptionsPane);
@@ -10992,14 +11540,16 @@ static void publishing_piwigo_publishing_options_pane_finalize (GObject * obj) {
 	_g_free0 (self->priv->_default_comment);
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (publishing_piwigo_publishing_options_pane_parent_class)->finalize (obj);
-#line 10981 "PiwigoPublishing.c"
+#line 11529 "PiwigoPublishing.c"
 }
 
 
 /**
  * The publishing options pane.
  */
-GType publishing_piwigo_publishing_options_pane_get_type (void) {
+GType
+publishing_piwigo_publishing_options_pane_get_type (void)
+{
 	static volatile gsize publishing_piwigo_publishing_options_pane_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_piwigo_publishing_options_pane_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingPiwigoPublishingOptionsPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_piwigo_publishing_options_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPiwigoPublishingOptionsPane), 0, (GInstanceInitFunc) publishing_piwigo_publishing_options_pane_instance_init, NULL };
@@ -11011,7 +11561,12 @@ GType publishing_piwigo_publishing_options_pane_get_type (void) {
 }
 
 
-static void _vala_publishing_piwigo_publishing_options_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
+static void
+_vala_publishing_piwigo_publishing_options_pane_get_property (GObject * object,
+                                                              guint property_id,
+                                                              GValue * value,
+                                                              GParamSpec * pspec)
+{
 	PublishingPiwigoPublishingOptionsPane * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPiwigoPublishingOptionsPane);
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11064,18 +11619,23 @@ static void _vala_publishing_piwigo_publishing_options_pane_get_property (GObjec
 		g_value_set_string (value, publishing_piwigo_publishing_options_pane_get_default_comment (self));
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
-#line 11053 "PiwigoPublishing.c"
+#line 11608 "PiwigoPublishing.c"
 		default:
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
-#line 11059 "PiwigoPublishing.c"
+#line 11614 "PiwigoPublishing.c"
 	}
 }
 
 
-static void _vala_publishing_piwigo_publishing_options_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
+static void
+_vala_publishing_piwigo_publishing_options_pane_set_property (GObject * object,
+                                                              guint property_id,
+                                                              const GValue * value,
+                                                              GParamSpec * pspec)
+{
 	PublishingPiwigoPublishingOptionsPane * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPiwigoPublishingOptionsPane);
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11128,35 +11688,41 @@ static void _vala_publishing_piwigo_publishing_options_pane_set_property (GObjec
 		publishing_piwigo_publishing_options_pane_set_default_comment (self, g_value_get_string (value));
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
-#line 11117 "PiwigoPublishing.c"
+#line 11677 "PiwigoPublishing.c"
 		default:
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		break;
-#line 11123 "PiwigoPublishing.c"
+#line 11683 "PiwigoPublishing.c"
 	}
 }
 
 
-PublishingPiwigoSession* publishing_piwigo_session_construct (GType object_type) {
+PublishingPiwigoSession*
+publishing_piwigo_session_construct (GType object_type)
+{
 	PublishingPiwigoSession* self = NULL;
 #line 1548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = (PublishingPiwigoSession*) publishing_rest_support_session_construct (object_type, "");
 #line 1547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 11134 "PiwigoPublishing.c"
+#line 11696 "PiwigoPublishing.c"
 }
 
 
-PublishingPiwigoSession* publishing_piwigo_session_new (void) {
+PublishingPiwigoSession*
+publishing_piwigo_session_new (void)
+{
 #line 1547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_session_construct (PUBLISHING_PIWIGO_TYPE_SESSION);
-#line 11141 "PiwigoPublishing.c"
+#line 11705 "PiwigoPublishing.c"
 }
 
 
-static gboolean publishing_piwigo_session_real_is_authenticated (PublishingRESTSupportSession* base) {
+static gboolean
+publishing_piwigo_session_real_is_authenticated (PublishingRESTSupportSession* base)
+{
 	PublishingPiwigoSession * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
@@ -11168,47 +11734,49 @@ static gboolean publishing_piwigo_session_real_is_authenticated (PublishingRESTS
 	_tmp2_ = self->priv->pwg_id;
 #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp2_ != NULL) {
-#line 11157 "PiwigoPublishing.c"
+#line 11723 "PiwigoPublishing.c"
 		const gchar* _tmp3_;
 #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp3_ = self->priv->pwg_url;
 #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 11163 "PiwigoPublishing.c"
+#line 11729 "PiwigoPublishing.c"
 	} else {
 #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp1_ = FALSE;
-#line 11167 "PiwigoPublishing.c"
+#line 11733 "PiwigoPublishing.c"
 	}
 #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp1_) {
-#line 11171 "PiwigoPublishing.c"
+#line 11737 "PiwigoPublishing.c"
 		const gchar* _tmp4_;
 #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp4_ = self->priv->username;
 #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp0_ = _tmp4_ != NULL;
-#line 11177 "PiwigoPublishing.c"
+#line 11743 "PiwigoPublishing.c"
 	} else {
 #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp0_ = FALSE;
-#line 11181 "PiwigoPublishing.c"
+#line 11747 "PiwigoPublishing.c"
 	}
 #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _tmp0_;
 #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 11187 "PiwigoPublishing.c"
+#line 11753 "PiwigoPublishing.c"
 }
 
 
-void publishing_piwigo_session_authenticate (PublishingPiwigoSession* self, const gchar* url, const gchar* username, const gchar* id) {
-	const gchar* _tmp0_;
+void
+publishing_piwigo_session_authenticate (PublishingPiwigoSession* self,
+                                        const gchar* url,
+                                        const gchar* username,
+                                        const gchar* id)
+{
+	gchar* _tmp0_;
 	gchar* _tmp1_;
-	const gchar* _tmp2_;
-	gchar* _tmp3_;
-	const gchar* _tmp4_;
-	gchar* _tmp5_;
+	gchar* _tmp2_;
 #line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_SESSION (self));
 #line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11218,34 +11786,30 @@ void publishing_piwigo_session_authenticate (PublishingPiwigoSession* self, cons
 #line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (id != NULL);
 #line 1556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = url;
-#line 1556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (url);
 #line 1556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->priv->pwg_url);
 #line 1556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->pwg_url = _tmp1_;
-#line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = username;
+	self->priv->pwg_url = _tmp0_;
 #line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp3_ = g_strdup (_tmp2_);
+	_tmp1_ = g_strdup (username);
 #line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->priv->username);
 #line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->username = _tmp3_;
+	self->priv->username = _tmp1_;
 #line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp4_ = id;
-#line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp5_ = g_strdup (_tmp4_);
+	_tmp2_ = g_strdup (id);
 #line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->priv->pwg_id);
 #line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->pwg_id = _tmp5_;
-#line 11230 "PiwigoPublishing.c"
+	self->priv->pwg_id = _tmp2_;
+#line 11792 "PiwigoPublishing.c"
 }
 
 
-void publishing_piwigo_session_deauthenticate (PublishingPiwigoSession* self) {
+void
+publishing_piwigo_session_deauthenticate (PublishingPiwigoSession* self)
+{
 #line 1561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_SESSION (self));
 #line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11260,11 +11824,13 @@ void publishing_piwigo_session_deauthenticate (PublishingPiwigoSession* self) {
 	_g_free0 (self->priv->username);
 #line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->username = NULL;
-#line 11249 "PiwigoPublishing.c"
+#line 11813 "PiwigoPublishing.c"
 }
 
 
-gchar* publishing_piwigo_session_get_username (PublishingPiwigoSession* self) {
+gchar*
+publishing_piwigo_session_get_username (PublishingPiwigoSession* self)
+{
 	gchar* result = NULL;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
@@ -11278,11 +11844,13 @@ gchar* publishing_piwigo_session_get_username (PublishingPiwigoSession* self) {
 	result = _tmp1_;
 #line 1568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 11267 "PiwigoPublishing.c"
+#line 11833 "PiwigoPublishing.c"
 }
 
 
-gchar* publishing_piwigo_session_get_pwg_url (PublishingPiwigoSession* self) {
+gchar*
+publishing_piwigo_session_get_pwg_url (PublishingPiwigoSession* self)
+{
 	gchar* result = NULL;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
@@ -11296,11 +11864,13 @@ gchar* publishing_piwigo_session_get_pwg_url (PublishingPiwigoSession* self) {
 	result = _tmp1_;
 #line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 11285 "PiwigoPublishing.c"
+#line 11853 "PiwigoPublishing.c"
 }
 
 
-gchar* publishing_piwigo_session_get_pwg_id (PublishingPiwigoSession* self) {
+gchar*
+publishing_piwigo_session_get_pwg_id (PublishingPiwigoSession* self)
+{
 	gchar* result = NULL;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
@@ -11314,30 +11884,32 @@ gchar* publishing_piwigo_session_get_pwg_id (PublishingPiwigoSession* self) {
 	result = _tmp1_;
 #line 1576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 11303 "PiwigoPublishing.c"
+#line 11873 "PiwigoPublishing.c"
 }
 
 
-void publishing_piwigo_session_set_pwg_id (PublishingPiwigoSession* self, const gchar* id) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
+void
+publishing_piwigo_session_set_pwg_id (PublishingPiwigoSession* self,
+                                      const gchar* id)
+{
+	gchar* _tmp0_;
 #line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_SESSION (self));
 #line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (id != NULL);
 #line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = id;
-#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (id);
 #line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->priv->pwg_id);
 #line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->pwg_id = _tmp1_;
-#line 11322 "PiwigoPublishing.c"
+	self->priv->pwg_id = _tmp0_;
+#line 11892 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_session_class_init (PublishingPiwigoSessionClass * klass) {
+static void
+publishing_piwigo_session_class_init (PublishingPiwigoSessionClass * klass)
+{
 #line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_session_parent_class = g_type_class_peek_parent (klass);
 #line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11346,11 +11918,13 @@ static void publishing_piwigo_session_class_init (PublishingPiwigoSessionClass *
 	g_type_class_add_private (klass, sizeof (PublishingPiwigoSessionPrivate));
 #line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_piwigo_session_real_is_authenticated;
-#line 11335 "PiwigoPublishing.c"
+#line 11907 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_session_instance_init (PublishingPiwigoSession * self) {
+static void
+publishing_piwigo_session_instance_init (PublishingPiwigoSession * self)
+{
 #line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv = PUBLISHING_PIWIGO_SESSION_GET_PRIVATE (self);
 #line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11359,11 +11933,13 @@ static void publishing_piwigo_session_instance_init (PublishingPiwigoSession * s
 	self->priv->pwg_id = NULL;
 #line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->username = NULL;
-#line 11348 "PiwigoPublishing.c"
+#line 11922 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_session_finalize (PublishingRESTSupportSession * obj) {
+static void
+publishing_piwigo_session_finalize (PublishingRESTSupportSession * obj)
+{
 	PublishingPiwigoSession * self;
 #line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_SESSION, PublishingPiwigoSession);
@@ -11375,7 +11951,7 @@ static void publishing_piwigo_session_finalize (PublishingRESTSupportSession * o
 	_g_free0 (self->priv->username);
 #line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_piwigo_session_parent_class)->finalize (obj);
-#line 11364 "PiwigoPublishing.c"
+#line 11940 "PiwigoPublishing.c"
 }
 
 
@@ -11383,7 +11959,9 @@ static void publishing_piwigo_session_finalize (PublishingRESTSupportSession * o
  * Session class that keeps track of the authentication status and of the
  * user token pwg_id.
  */
-GType publishing_piwigo_session_get_type (void) {
+GType
+publishing_piwigo_session_get_type (void)
+{
 	static volatile gsize publishing_piwigo_session_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_piwigo_session_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingPiwigoSessionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_piwigo_session_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPiwigoSession), 0, (GInstanceInitFunc) publishing_piwigo_session_instance_init, NULL };
@@ -11395,195 +11973,180 @@ GType publishing_piwigo_session_get_type (void) {
 }
 
 
-PublishingPiwigoTransaction* publishing_piwigo_transaction_construct (GType object_type, PublishingPiwigoSession* session) {
+PublishingPiwigoTransaction*
+publishing_piwigo_transaction_construct (GType object_type,
+                                         PublishingPiwigoSession* session)
+{
 	PublishingPiwigoTransaction* self = NULL;
-	PublishingPiwigoSession* _tmp0_;
-	PublishingPiwigoSession* _tmp1_;
-	gboolean _tmp2_;
 #line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
 #line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = session;
-#line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self = (PublishingPiwigoTransaction*) publishing_rest_support_transaction_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+	self = (PublishingPiwigoTransaction*) publishing_rest_support_transaction_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
 #line 1595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = session;
-#line 1595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 1595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (_tmp2_) {
-#line 11401 "PiwigoPublishing.c"
-		PublishingPiwigoSession* _tmp3_;
-		gchar* _tmp4_;
-		gchar* _tmp5_;
-		gchar* _tmp6_;
-		gchar* _tmp7_;
-#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp3_ = session;
+	if (publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
+#line 11973 "PiwigoPublishing.c"
+		gchar* _tmp0_;
+		gchar* _tmp1_;
+		gchar* _tmp2_;
+		gchar* _tmp3_;
 #line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp4_ = publishing_piwigo_session_get_pwg_id (_tmp3_);
+		_tmp0_ = publishing_piwigo_session_get_pwg_id (session);
 #line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp5_ = _tmp4_;
+		_tmp1_ = _tmp0_;
 #line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp6_ = g_strconcat ("pwg_id=", _tmp5_, NULL);
+		_tmp2_ = g_strconcat ("pwg_id=", _tmp1_, NULL);
 #line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp7_ = _tmp6_;
+		_tmp3_ = _tmp2_;
 #line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Cookie", _tmp7_);
+		publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Cookie", _tmp3_);
 #line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_free0 (_tmp7_);
+		_g_free0 (_tmp3_);
 #line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_free0 (_tmp5_);
-#line 11423 "PiwigoPublishing.c"
+		_g_free0 (_tmp1_);
+#line 11992 "PiwigoPublishing.c"
 	}
 #line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 11427 "PiwigoPublishing.c"
+#line 11996 "PiwigoPublishing.c"
 }
 
 
-PublishingPiwigoTransaction* publishing_piwigo_transaction_new (PublishingPiwigoSession* session) {
+PublishingPiwigoTransaction*
+publishing_piwigo_transaction_new (PublishingPiwigoSession* session)
+{
 #line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_transaction_construct (PUBLISHING_PIWIGO_TYPE_TRANSACTION, session);
-#line 11434 "PiwigoPublishing.c"
+#line 12005 "PiwigoPublishing.c"
 }
 
 
-PublishingPiwigoTransaction* publishing_piwigo_transaction_construct_authenticated (GType object_type, PublishingPiwigoSession* session) {
+PublishingPiwigoTransaction*
+publishing_piwigo_transaction_construct_authenticated (GType object_type,
+                                                       PublishingPiwigoSession* session)
+{
 	PublishingPiwigoTransaction* self = NULL;
-	PublishingPiwigoSession* _tmp0_;
-	PublishingPiwigoSession* _tmp1_;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
 	gchar* _tmp2_;
 	gchar* _tmp3_;
-	PublishingPiwigoSession* _tmp4_;
+	gchar* _tmp4_;
 	gchar* _tmp5_;
-	gchar* _tmp6_;
-	gchar* _tmp7_;
-	gchar* _tmp8_;
 #line 1600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
 #line 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = session;
-#line 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = session;
+	_tmp0_ = publishing_piwigo_session_get_pwg_url (session);
 #line 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = publishing_piwigo_session_get_pwg_url (_tmp1_);
-#line 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp3_ = _tmp2_;
+	_tmp1_ = _tmp0_;
 #line 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self = (PublishingPiwigoTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp3_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+	self = (PublishingPiwigoTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
 #line 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_free0 (_tmp3_);
+	_g_free0 (_tmp1_);
 #line 1602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp4_ = session;
+	_tmp2_ = publishing_piwigo_session_get_pwg_id (session);
 #line 1602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp5_ = publishing_piwigo_session_get_pwg_id (_tmp4_);
-#line 1602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp6_ = _tmp5_;
+	_tmp3_ = _tmp2_;
 #line 1602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp7_ = g_strconcat ("pwg_id=", _tmp6_, NULL);
+	_tmp4_ = g_strconcat ("pwg_id=", _tmp3_, NULL);
 #line 1602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp8_ = _tmp7_;
+	_tmp5_ = _tmp4_;
 #line 1602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Cookie", _tmp8_);
+	publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Cookie", _tmp5_);
 #line 1602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_free0 (_tmp8_);
+	_g_free0 (_tmp5_);
 #line 1602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_free0 (_tmp6_);
+	_g_free0 (_tmp3_);
 #line 1600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 11481 "PiwigoPublishing.c"
+#line 12046 "PiwigoPublishing.c"
 }
 
 
-PublishingPiwigoTransaction* publishing_piwigo_transaction_new_authenticated (PublishingPiwigoSession* session) {
+PublishingPiwigoTransaction*
+publishing_piwigo_transaction_new_authenticated (PublishingPiwigoSession* session)
+{
 #line 1600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_transaction_construct_authenticated (PUBLISHING_PIWIGO_TYPE_TRANSACTION, session);
-#line 11488 "PiwigoPublishing.c"
+#line 12055 "PiwigoPublishing.c"
 }
 
 
-gchar* publishing_piwigo_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc) {
+gchar*
+publishing_piwigo_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc)
+{
 	gchar* result = NULL;
 	xmlNode* root = NULL;
-	PublishingRESTSupportXmlDocument* _tmp0_;
-	xmlNode* _tmp1_;
+	xmlNode* _tmp0_;
 	gchar* status = NULL;
-	xmlNode* _tmp2_;
-	gchar* _tmp3_;
-	const gchar* _tmp4_;
-	const gchar* _tmp6_;
+	xmlNode* _tmp1_;
+	gchar* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp5_;
 	xmlNode* errcode = NULL;
-	xmlNode* _tmp12_;
-	gchar* _tmp13_;
+	xmlNode* _tmp10_;
+	gchar* _tmp11_;
+	gchar* _tmp12_;
+	xmlNode* _tmp13_;
 	gchar* _tmp14_;
-	xmlNode* _tmp15_;
+	gchar* _tmp15_;
 	gchar* _tmp16_;
 	gchar* _tmp17_;
-	gchar* _tmp18_;
-	gchar* _tmp19_;
 	GError * _inner_error_ = NULL;
 #line 1605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL);
 #line 1606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = doc;
+	_tmp0_ = publishing_rest_support_xml_document_get_root_node (doc);
 #line 1606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = publishing_rest_support_xml_document_get_root_node (_tmp0_);
-#line 1606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	root = _tmp1_;
+	root = _tmp0_;
 #line 1607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = root;
+	_tmp1_ = root;
 #line 1607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp3_ = (gchar*) xmlGetProp (_tmp2_, (xmlChar*) "stat");
+	_tmp2_ = (gchar*) xmlGetProp (_tmp1_, (xmlChar*) "stat");
 #line 1607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	status = _tmp3_;
+	status = _tmp2_;
 #line 1610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp4_ = status;
+	_tmp3_ = status;
 #line 1610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (_tmp4_ == NULL) {
-#line 11530 "PiwigoPublishing.c"
-		gchar* _tmp5_;
+	if (_tmp3_ == NULL) {
+#line 12096 "PiwigoPublishing.c"
+		gchar* _tmp4_;
 #line 1611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp5_ = g_strdup ("No status property in root node");
+		_tmp4_ = g_strdup ("No status property in root node");
 #line 1611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		result = _tmp5_;
+		result = _tmp4_;
 #line 1611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (status);
 #line 1611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return result;
-#line 11540 "PiwigoPublishing.c"
+#line 12106 "PiwigoPublishing.c"
 	}
 #line 1613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp6_ = status;
+	_tmp5_ = status;
 #line 1613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (g_strcmp0 (_tmp6_, "ok") == 0) {
+	if (g_strcmp0 (_tmp5_, "ok") == 0) {
 #line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		result = NULL;
 #line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (status);
 #line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return result;
-#line 11552 "PiwigoPublishing.c"
+#line 12118 "PiwigoPublishing.c"
 	}
 	{
-		xmlNode* _tmp7_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp8_;
-		xmlNode* _tmp9_;
-		xmlNode* _tmp10_;
-#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp8_ = doc;
+		xmlNode* _tmp6_ = NULL;
+		xmlNode* _tmp7_;
+		xmlNode* _tmp8_;
 #line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp9_ = root;
+		_tmp7_ = root;
 #line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp10_ = publishing_rest_support_xml_document_get_named_child (_tmp8_, _tmp9_, "err", &_inner_error_);
+		_tmp8_ = publishing_rest_support_xml_document_get_named_child (doc, _tmp7_, "err", &_inner_error_);
 #line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp7_ = _tmp10_;
+		_tmp6_ = _tmp8_;
 #line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 11571 "PiwigoPublishing.c"
-				goto __catch35_spit_publishing_publishing_error;
+#line 12134 "PiwigoPublishing.c"
+				goto __catch40_spit_publishing_publishing_error;
 			}
 #line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_free0 (status);
@@ -11593,34 +12156,34 @@ gchar* publishing_piwigo_transaction_validate_xml (PublishingRESTSupportXmlDocum
 			g_clear_error (&_inner_error_);
 #line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return NULL;
-#line 11582 "PiwigoPublishing.c"
+#line 12145 "PiwigoPublishing.c"
 		}
 #line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		errcode = _tmp7_;
-#line 11586 "PiwigoPublishing.c"
+		errcode = _tmp6_;
+#line 12149 "PiwigoPublishing.c"
 	}
-	goto __finally35;
-	__catch35_spit_publishing_publishing_error:
+	goto __finally40;
+	__catch40_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		gchar* _tmp11_;
+		gchar* _tmp9_;
 #line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		err = _inner_error_;
 #line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_inner_error_ = NULL;
 #line 1620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp11_ = g_strdup ("No error code specified");
+		_tmp9_ = g_strdup ("No error code specified");
 #line 1620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		result = _tmp11_;
+		result = _tmp9_;
 #line 1620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_error_free0 (err);
 #line 1620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (status);
 #line 1620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return result;
-#line 11607 "PiwigoPublishing.c"
+#line 12170 "PiwigoPublishing.c"
 	}
-	__finally35:
+	__finally40:
 #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"
@@ -11631,75 +12194,71 @@ gchar* publishing_piwigo_transaction_validate_xml (PublishingRESTSupportXmlDocum
 		g_clear_error (&_inner_error_);
 #line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return NULL;
-#line 11620 "PiwigoPublishing.c"
+#line 12183 "PiwigoPublishing.c"
 	}
 #line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp12_ = errcode;
+	_tmp10_ = errcode;
 #line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp13_ = (gchar*) xmlGetProp (_tmp12_, (xmlChar*) "msg");
+	_tmp11_ = (gchar*) xmlGetProp (_tmp10_, (xmlChar*) "msg");
 #line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp14_ = _tmp13_;
+	_tmp12_ = _tmp11_;
 #line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp15_ = errcode;
+	_tmp13_ = errcode;
 #line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp16_ = (gchar*) xmlGetProp (_tmp15_, (xmlChar*) "code");
+	_tmp14_ = (gchar*) xmlGetProp (_tmp13_, (xmlChar*) "code");
 #line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp17_ = _tmp16_;
+	_tmp15_ = _tmp14_;
 #line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp18_ = g_strdup_printf ("%s (error code %s)", _tmp14_, _tmp17_);
+	_tmp16_ = g_strdup_printf ("%s (error code %s)", _tmp12_, _tmp15_);
 #line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp19_ = _tmp18_;
+	_tmp17_ = _tmp16_;
 #line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_free0 (_tmp17_);
+	_g_free0 (_tmp15_);
 #line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_free0 (_tmp14_);
+	_g_free0 (_tmp12_);
 #line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	result = _tmp19_;
+	result = _tmp17_;
 #line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (status);
 #line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 11648 "PiwigoPublishing.c"
+#line 12211 "PiwigoPublishing.c"
 }
 
 
-gchar* publishing_piwigo_transaction_get_error_code (PublishingRESTSupportXmlDocument* doc) {
+gchar*
+publishing_piwigo_transaction_get_error_code (PublishingRESTSupportXmlDocument* doc)
+{
 	gchar* result = NULL;
 	xmlNode* root = NULL;
-	PublishingRESTSupportXmlDocument* _tmp0_;
-	xmlNode* _tmp1_;
+	xmlNode* _tmp0_;
 	xmlNode* errcode = NULL;
-	xmlNode* _tmp7_;
-	gchar* _tmp8_;
+	xmlNode* _tmp5_;
+	gchar* _tmp6_;
 	GError * _inner_error_ = NULL;
 #line 1626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL);
 #line 1627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = doc;
-#line 1627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = publishing_rest_support_xml_document_get_root_node (_tmp0_);
+	_tmp0_ = publishing_rest_support_xml_document_get_root_node (doc);
 #line 1627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	root = _tmp1_;
-#line 11669 "PiwigoPublishing.c"
+	root = _tmp0_;
+#line 12231 "PiwigoPublishing.c"
 	{
-		xmlNode* _tmp2_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp3_;
-		xmlNode* _tmp4_;
-		xmlNode* _tmp5_;
+		xmlNode* _tmp1_ = NULL;
+		xmlNode* _tmp2_;
+		xmlNode* _tmp3_;
 #line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp3_ = doc;
+		_tmp2_ = root;
 #line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp4_ = root;
+		_tmp3_ = publishing_rest_support_xml_document_get_named_child (doc, _tmp2_, "err", &_inner_error_);
 #line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp5_ = publishing_rest_support_xml_document_get_named_child (_tmp3_, _tmp4_, "err", &_inner_error_);
-#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp2_ = _tmp5_;
+		_tmp1_ = _tmp3_;
 #line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 11687 "PiwigoPublishing.c"
-				goto __catch36_spit_publishing_publishing_error;
+#line 12246 "PiwigoPublishing.c"
+				goto __catch41_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,32 +12266,32 @@ gchar* publishing_piwigo_transaction_get_error_code (PublishingRESTSupportXmlDoc
 			g_clear_error (&_inner_error_);
 #line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return NULL;
-#line 11696 "PiwigoPublishing.c"
+#line 12255 "PiwigoPublishing.c"
 		}
 #line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		errcode = _tmp2_;
-#line 11700 "PiwigoPublishing.c"
+		errcode = _tmp1_;
+#line 12259 "PiwigoPublishing.c"
 	}
-	goto __finally36;
-	__catch36_spit_publishing_publishing_error:
+	goto __finally41;
+	__catch41_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		gchar* _tmp6_;
+		gchar* _tmp4_;
 #line 1629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		err = _inner_error_;
 #line 1629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_inner_error_ = NULL;
 #line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp6_ = g_strdup ("0");
+		_tmp4_ = g_strdup ("0");
 #line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		result = _tmp6_;
+		result = _tmp4_;
 #line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_error_free0 (err);
 #line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return result;
-#line 11719 "PiwigoPublishing.c"
+#line 12278 "PiwigoPublishing.c"
 	}
-	__finally36:
+	__finally41:
 #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"
@@ -11741,28 +12300,32 @@ gchar* publishing_piwigo_transaction_get_error_code (PublishingRESTSupportXmlDoc
 		g_clear_error (&_inner_error_);
 #line 1629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return NULL;
-#line 11730 "PiwigoPublishing.c"
+#line 12289 "PiwigoPublishing.c"
 	}
 #line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp7_ = errcode;
+	_tmp5_ = errcode;
 #line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp8_ = (gchar*) xmlGetProp (_tmp7_, (xmlChar*) "code");
+	_tmp6_ = (gchar*) xmlGetProp (_tmp5_, (xmlChar*) "code");
 #line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	result = _tmp8_;
+	result = _tmp6_;
 #line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 11740 "PiwigoPublishing.c"
+#line 12299 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_transaction_class_init (PublishingPiwigoTransactionClass * klass) {
+static void
+publishing_piwigo_transaction_class_init (PublishingPiwigoTransactionClass * klass)
+{
 #line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 11747 "PiwigoPublishing.c"
+#line 12308 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_transaction_instance_init (PublishingPiwigoTransaction * self) {
+static void
+publishing_piwigo_transaction_instance_init (PublishingPiwigoTransaction * self)
+{
 }
 
 
@@ -11774,7 +12337,9 @@ static void publishing_piwigo_transaction_instance_init (PublishingPiwigoTransac
  * session has been authenticated, the pwg_id token is included in the
  * transaction header.
  */
-GType publishing_piwigo_transaction_get_type (void) {
+GType
+publishing_piwigo_transaction_get_type (void)
+{
 	static volatile gsize publishing_piwigo_transaction_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_piwigo_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingPiwigoTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_piwigo_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPiwigoTransaction), 0, (GInstanceInitFunc) publishing_piwigo_transaction_instance_init, NULL };
@@ -11786,12 +12351,18 @@ GType publishing_piwigo_transaction_get_type (void) {
 }
 
 
-PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_construct (GType object_type, PublishingPiwigoSession* session, const gchar* url, const gchar* username, const gchar* password) {
+PublishingPiwigoSessionLoginTransaction*
+publishing_piwigo_session_login_transaction_construct (GType object_type,
+                                                       PublishingPiwigoSession* session,
+                                                       const gchar* url,
+                                                       const gchar* username,
+                                                       const gchar* password)
+{
 	PublishingPiwigoSessionLoginTransaction* self = NULL;
-	PublishingPiwigoSession* _tmp0_;
-	const gchar* _tmp1_;
-	const gchar* _tmp2_;
-	const gchar* _tmp3_;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 #line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
 #line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11801,142 +12372,157 @@ PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transac
 #line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (password != NULL, NULL);
 #line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = session;
-#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = url;
-#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self = (PublishingPiwigoSessionLoginTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+	self = (PublishingPiwigoSessionLoginTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), url, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
 #line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.session.login");
 #line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = username;
+	_tmp0_ = g_uri_escape_string (username, NULL, TRUE);
 #line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "username", _tmp2_);
+	_tmp1_ = _tmp0_;
+#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "username", _tmp1_);
+#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_free0 (_tmp1_);
 #line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp3_ = password;
+	_tmp2_ = g_uri_escape_string (password, NULL, TRUE);
+#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp3_ = _tmp2_;
 #line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "password", _tmp3_);
+#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_free0 (_tmp3_);
 #line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 11807 "PiwigoPublishing.c"
+#line 12382 "PiwigoPublishing.c"
 }
 
 
-PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_new (PublishingPiwigoSession* session, const gchar* url, const gchar* username, const gchar* password) {
+PublishingPiwigoSessionLoginTransaction*
+publishing_piwigo_session_login_transaction_new (PublishingPiwigoSession* session,
+                                                 const gchar* url,
+                                                 const gchar* username,
+                                                 const gchar* password)
+{
 #line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_session_login_transaction_construct (PUBLISHING_PIWIGO_TYPE_SESSION_LOGIN_TRANSACTION, session, url, username, password);
-#line 11814 "PiwigoPublishing.c"
+#line 12394 "PiwigoPublishing.c"
 }
 
 
-static gpointer _publishing_rest_support_argument_ref0 (gpointer self) {
+static gpointer
+_publishing_rest_support_argument_ref0 (gpointer self)
+{
 #line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self ? publishing_rest_support_argument_ref (self) : NULL;
-#line 11821 "PiwigoPublishing.c"
+#line 12403 "PiwigoPublishing.c"
 }
 
 
-PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_construct_from_other (GType object_type, PublishingPiwigoSession* session, PublishingPiwigoTransaction* other) {
+PublishingPiwigoSessionLoginTransaction*
+publishing_piwigo_session_login_transaction_construct_from_other (GType object_type,
+                                                                  PublishingPiwigoSession* session,
+                                                                  PublishingPiwigoTransaction* other)
+{
 	PublishingPiwigoSessionLoginTransaction* self = NULL;
-	PublishingPiwigoSession* _tmp0_;
-	PublishingPiwigoTransaction* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	PublishingPiwigoTransaction* _tmp4_;
-	gint _tmp5_;
-	PublishingRESTSupportArgument** _tmp6_;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gint _tmp2_;
+	PublishingRESTSupportArgument** _tmp3_;
 #line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
 #line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_TRANSACTION (other), NULL);
 #line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = session;
-#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = other;
-#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
+	_tmp0_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (other, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
 #line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp3_ = _tmp2_;
+	_tmp1_ = _tmp0_;
 #line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self = (PublishingPiwigoSessionLoginTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp3_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+	self = (PublishingPiwigoSessionLoginTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
 #line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_free0 (_tmp3_);
+	_g_free0 (_tmp1_);
 #line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp4_ = other;
-#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp6_ = publishing_rest_support_transaction_get_arguments (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_tmp5_);
-#line 11854 "PiwigoPublishing.c"
+	_tmp3_ = publishing_rest_support_transaction_get_arguments (G_TYPE_CHECK_INSTANCE_CAST (other, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_tmp2_);
+#line 12431 "PiwigoPublishing.c"
 	{
 		PublishingRESTSupportArgument** argument_collection = NULL;
 		gint argument_collection_length1 = 0;
 		gint _argument_collection_size_ = 0;
 		gint argument_it = 0;
 #line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		argument_collection = _tmp6_;
+		argument_collection = _tmp3_;
 #line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		argument_collection_length1 = _tmp5_;
+		argument_collection_length1 = _tmp2_;
 #line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		for (argument_it = 0; argument_it < _tmp5_; argument_it = argument_it + 1) {
-#line 11866 "PiwigoPublishing.c"
-			PublishingRESTSupportArgument* _tmp7_;
+		for (argument_it = 0; argument_it < _tmp2_; argument_it = argument_it + 1) {
+#line 12443 "PiwigoPublishing.c"
+			PublishingRESTSupportArgument* _tmp4_;
 			PublishingRESTSupportArgument* argument = NULL;
 #line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp7_ = _publishing_rest_support_argument_ref0 (argument_collection[argument_it]);
+			_tmp4_ = _publishing_rest_support_argument_ref0 (argument_collection[argument_it]);
 #line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			argument = _tmp7_;
-#line 11873 "PiwigoPublishing.c"
+			argument = _tmp4_;
+#line 12450 "PiwigoPublishing.c"
 			{
-				PublishingRESTSupportArgument* _tmp8_;
-				const gchar* _tmp9_;
-				PublishingRESTSupportArgument* _tmp10_;
-				const gchar* _tmp11_;
+				PublishingRESTSupportArgument* _tmp5_;
+				const gchar* _tmp6_;
+				PublishingRESTSupportArgument* _tmp7_;
+				const gchar* _tmp8_;
 #line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp8_ = argument;
+				_tmp5_ = argument;
 #line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp9_ = _tmp8_->key;
+				_tmp6_ = _tmp5_->key;
 #line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp10_ = argument;
+				_tmp7_ = argument;
 #line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp11_ = _tmp10_->value;
+				_tmp8_ = _tmp7_->value;
 #line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp9_, _tmp11_);
+				publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp6_, _tmp8_);
 #line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_publishing_rest_support_argument_unref0 (argument);
-#line 11891 "PiwigoPublishing.c"
+#line 12468 "PiwigoPublishing.c"
 			}
 		}
 #line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		argument_collection = (_vala_array_free (argument_collection, argument_collection_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 11896 "PiwigoPublishing.c"
+#line 12473 "PiwigoPublishing.c"
 	}
 #line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 11900 "PiwigoPublishing.c"
+#line 12477 "PiwigoPublishing.c"
 }
 
 
-PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_new_from_other (PublishingPiwigoSession* session, PublishingPiwigoTransaction* other) {
+PublishingPiwigoSessionLoginTransaction*
+publishing_piwigo_session_login_transaction_new_from_other (PublishingPiwigoSession* session,
+                                                            PublishingPiwigoTransaction* other)
+{
 #line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_session_login_transaction_construct_from_other (PUBLISHING_PIWIGO_TYPE_SESSION_LOGIN_TRANSACTION, session, other);
-#line 11907 "PiwigoPublishing.c"
+#line 12487 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_session_login_transaction_class_init (PublishingPiwigoSessionLoginTransactionClass * klass) {
+static void
+publishing_piwigo_session_login_transaction_class_init (PublishingPiwigoSessionLoginTransactionClass * klass)
+{
 #line 1641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_session_login_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 11914 "PiwigoPublishing.c"
+#line 12496 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_session_login_transaction_instance_init (PublishingPiwigoSessionLoginTransaction * self) {
+static void
+publishing_piwigo_session_login_transaction_instance_init (PublishingPiwigoSessionLoginTransaction * self)
+{
 }
 
 
 /**
  * Transaction used to implement the network login interaction.
  */
-GType publishing_piwigo_session_login_transaction_get_type (void) {
+GType
+publishing_piwigo_session_login_transaction_get_type (void)
+{
 	static volatile gsize publishing_piwigo_session_login_transaction_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_piwigo_session_login_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingPiwigoSessionLoginTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_piwigo_session_login_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPiwigoSessionLoginTransaction), 0, (GInstanceInitFunc) publishing_piwigo_session_login_transaction_instance_init, NULL };
@@ -11948,15 +12534,17 @@ GType publishing_piwigo_session_login_transaction_get_type (void) {
 }
 
 
-PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_construct_unauthenticated (GType object_type, PublishingPiwigoSession* session, const gchar* url, const gchar* pwg_id) {
+PublishingPiwigoSessionGetStatusTransaction*
+publishing_piwigo_session_get_status_transaction_construct_unauthenticated (GType object_type,
+                                                                            PublishingPiwigoSession* session,
+                                                                            const gchar* url,
+                                                                            const gchar* pwg_id)
+{
 	PublishingPiwigoSessionGetStatusTransaction* self = NULL;
-	PublishingPiwigoSession* _tmp0_;
-	const gchar* _tmp1_;
-	PublishingPiwigoSession* _tmp2_;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
 	gchar* _tmp3_;
-	gchar* _tmp4_;
-	gchar* _tmp5_;
-	gchar* _tmp6_;
 #line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
 #line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11964,81 +12552,87 @@ PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_statu
 #line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (pwg_id != NULL, NULL);
 #line 1664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = session;
-#line 1664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = url;
-#line 1664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self = (PublishingPiwigoSessionGetStatusTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+	self = (PublishingPiwigoSessionGetStatusTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), url, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
 #line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = session;
+	_tmp0_ = publishing_piwigo_session_get_pwg_id (session);
 #line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp3_ = publishing_piwigo_session_get_pwg_id (_tmp2_);
-#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp4_ = _tmp3_;
+	_tmp1_ = _tmp0_;
 #line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp5_ = g_strconcat ("pwg_id=", _tmp4_, NULL);
+	_tmp2_ = g_strconcat ("pwg_id=", _tmp1_, NULL);
 #line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp6_ = _tmp5_;
+	_tmp3_ = _tmp2_;
 #line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Cookie", _tmp6_);
+	publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Cookie", _tmp3_);
 #line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_free0 (_tmp6_);
+	_g_free0 (_tmp3_);
 #line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_free0 (_tmp4_);
+	_g_free0 (_tmp1_);
 #line 1667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.session.getStatus");
 #line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 11978 "PiwigoPublishing.c"
+#line 12560 "PiwigoPublishing.c"
 }
 
 
-PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_new_unauthenticated (PublishingPiwigoSession* session, const gchar* url, const gchar* pwg_id) {
+PublishingPiwigoSessionGetStatusTransaction*
+publishing_piwigo_session_get_status_transaction_new_unauthenticated (PublishingPiwigoSession* session,
+                                                                      const gchar* url,
+                                                                      const gchar* pwg_id)
+{
 #line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_session_get_status_transaction_construct_unauthenticated (PUBLISHING_PIWIGO_TYPE_SESSION_GET_STATUS_TRANSACTION, session, url, pwg_id);
-#line 11985 "PiwigoPublishing.c"
+#line 12571 "PiwigoPublishing.c"
 }
 
 
-PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_construct (GType object_type, PublishingPiwigoSession* session) {
+PublishingPiwigoSessionGetStatusTransaction*
+publishing_piwigo_session_get_status_transaction_construct (GType object_type,
+                                                            PublishingPiwigoSession* session)
+{
 	PublishingPiwigoSessionGetStatusTransaction* self = NULL;
-	PublishingPiwigoSession* _tmp0_;
 #line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
 #line 1671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = session;
-#line 1671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self = (PublishingPiwigoSessionGetStatusTransaction*) publishing_piwigo_transaction_construct_authenticated (object_type, _tmp0_);
+	self = (PublishingPiwigoSessionGetStatusTransaction*) publishing_piwigo_transaction_construct_authenticated (object_type, session);
 #line 1673 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.session.getStatus");
 #line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 12002 "PiwigoPublishing.c"
+#line 12588 "PiwigoPublishing.c"
 }
 
 
-PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_new (PublishingPiwigoSession* session) {
+PublishingPiwigoSessionGetStatusTransaction*
+publishing_piwigo_session_get_status_transaction_new (PublishingPiwigoSession* session)
+{
 #line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_session_get_status_transaction_construct (PUBLISHING_PIWIGO_TYPE_SESSION_GET_STATUS_TRANSACTION, session);
-#line 12009 "PiwigoPublishing.c"
+#line 12597 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_session_get_status_transaction_class_init (PublishingPiwigoSessionGetStatusTransactionClass * klass) {
+static void
+publishing_piwigo_session_get_status_transaction_class_init (PublishingPiwigoSessionGetStatusTransactionClass * klass)
+{
 #line 1662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_session_get_status_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 12016 "PiwigoPublishing.c"
+#line 12606 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_session_get_status_transaction_instance_init (PublishingPiwigoSessionGetStatusTransaction * self) {
+static void
+publishing_piwigo_session_get_status_transaction_instance_init (PublishingPiwigoSessionGetStatusTransaction * self)
+{
 }
 
 
 /**
  * Transaction used to implement the get status interaction.
  */
-GType publishing_piwigo_session_get_status_transaction_get_type (void) {
+GType
+publishing_piwigo_session_get_status_transaction_get_type (void)
+{
 	static volatile gsize publishing_piwigo_session_get_status_transaction_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_piwigo_session_get_status_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingPiwigoSessionGetStatusTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_piwigo_session_get_status_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPiwigoSessionGetStatusTransaction), 0, (GInstanceInitFunc) publishing_piwigo_session_get_status_transaction_instance_init, NULL };
@@ -12050,47 +12644,55 @@ GType publishing_piwigo_session_get_status_transaction_get_type (void) {
 }
 
 
-PublishingPiwigoCategoriesGetListTransaction* publishing_piwigo_categories_get_list_transaction_construct (GType object_type, PublishingPiwigoSession* session) {
+PublishingPiwigoCategoriesGetListTransaction*
+publishing_piwigo_categories_get_list_transaction_construct (GType object_type,
+                                                             PublishingPiwigoSession* session)
+{
 	PublishingPiwigoCategoriesGetListTransaction* self = NULL;
-	PublishingPiwigoSession* _tmp0_;
 #line 1681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
 #line 1682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = session;
-#line 1682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self = (PublishingPiwigoCategoriesGetListTransaction*) publishing_piwigo_transaction_construct_authenticated (object_type, _tmp0_);
+	self = (PublishingPiwigoCategoriesGetListTransaction*) publishing_piwigo_transaction_construct_authenticated (object_type, session);
 #line 1684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.categories.getList");
 #line 1685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "recursive", "true");
 #line 1681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 12054 "PiwigoPublishing.c"
+#line 12648 "PiwigoPublishing.c"
 }
 
 
-PublishingPiwigoCategoriesGetListTransaction* publishing_piwigo_categories_get_list_transaction_new (PublishingPiwigoSession* session) {
+PublishingPiwigoCategoriesGetListTransaction*
+publishing_piwigo_categories_get_list_transaction_new (PublishingPiwigoSession* session)
+{
 #line 1681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_categories_get_list_transaction_construct (PUBLISHING_PIWIGO_TYPE_CATEGORIES_GET_LIST_TRANSACTION, session);
-#line 12061 "PiwigoPublishing.c"
+#line 12657 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_categories_get_list_transaction_class_init (PublishingPiwigoCategoriesGetListTransactionClass * klass) {
+static void
+publishing_piwigo_categories_get_list_transaction_class_init (PublishingPiwigoCategoriesGetListTransactionClass * klass)
+{
 #line 1680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_categories_get_list_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 12068 "PiwigoPublishing.c"
+#line 12666 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_categories_get_list_transaction_instance_init (PublishingPiwigoCategoriesGetListTransaction * self) {
+static void
+publishing_piwigo_categories_get_list_transaction_instance_init (PublishingPiwigoCategoriesGetListTransaction * self)
+{
 }
 
 
 /**
  * Transaction used to implement the fetch categories interaction.
  */
-GType publishing_piwigo_categories_get_list_transaction_get_type (void) {
+GType
+publishing_piwigo_categories_get_list_transaction_get_type (void)
+{
 	static volatile gsize publishing_piwigo_categories_get_list_transaction_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_piwigo_categories_get_list_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingPiwigoCategoriesGetListTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_piwigo_categories_get_list_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPiwigoCategoriesGetListTransaction), 0, (GInstanceInitFunc) publishing_piwigo_categories_get_list_transaction_instance_init, NULL };
@@ -12102,42 +12704,50 @@ GType publishing_piwigo_categories_get_list_transaction_get_type (void) {
 }
 
 
-PublishingPiwigoSessionLogoutTransaction* publishing_piwigo_session_logout_transaction_construct (GType object_type, PublishingPiwigoSession* session) {
+PublishingPiwigoSessionLogoutTransaction*
+publishing_piwigo_session_logout_transaction_construct (GType object_type,
+                                                        PublishingPiwigoSession* session)
+{
 	PublishingPiwigoSessionLogoutTransaction* self = NULL;
-	PublishingPiwigoSession* _tmp0_;
 #line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
 #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = session;
-#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self = (PublishingPiwigoSessionLogoutTransaction*) publishing_piwigo_transaction_construct_authenticated (object_type, _tmp0_);
+	self = (PublishingPiwigoSessionLogoutTransaction*) publishing_piwigo_transaction_construct_authenticated (object_type, session);
 #line 1693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.session.logout");
 #line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 12104 "PiwigoPublishing.c"
+#line 12706 "PiwigoPublishing.c"
 }
 
 
-PublishingPiwigoSessionLogoutTransaction* publishing_piwigo_session_logout_transaction_new (PublishingPiwigoSession* session) {
+PublishingPiwigoSessionLogoutTransaction*
+publishing_piwigo_session_logout_transaction_new (PublishingPiwigoSession* session)
+{
 #line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_session_logout_transaction_construct (PUBLISHING_PIWIGO_TYPE_SESSION_LOGOUT_TRANSACTION, session);
-#line 12111 "PiwigoPublishing.c"
+#line 12715 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_session_logout_transaction_class_init (PublishingPiwigoSessionLogoutTransactionClass * klass) {
+static void
+publishing_piwigo_session_logout_transaction_class_init (PublishingPiwigoSessionLogoutTransactionClass * klass)
+{
 #line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_session_logout_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 12118 "PiwigoPublishing.c"
+#line 12724 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_session_logout_transaction_instance_init (PublishingPiwigoSessionLogoutTransaction * self) {
+static void
+publishing_piwigo_session_logout_transaction_instance_init (PublishingPiwigoSessionLogoutTransaction * self)
+{
 }
 
 
-GType publishing_piwigo_session_logout_transaction_get_type (void) {
+GType
+publishing_piwigo_session_logout_transaction_get_type (void)
+{
 	static volatile gsize publishing_piwigo_session_logout_transaction_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_piwigo_session_logout_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingPiwigoSessionLogoutTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_piwigo_session_logout_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPiwigoSessionLogoutTransaction), 0, (GInstanceInitFunc) publishing_piwigo_session_logout_transaction_instance_init, NULL };
@@ -12149,83 +12759,81 @@ GType publishing_piwigo_session_logout_transaction_get_type (void) {
 }
 
 
-PublishingPiwigoCategoriesAddTransaction* publishing_piwigo_categories_add_transaction_construct (GType object_type, PublishingPiwigoSession* session, const gchar* category, gint parent_id, const gchar* comment) {
+PublishingPiwigoCategoriesAddTransaction*
+publishing_piwigo_categories_add_transaction_construct (GType object_type,
+                                                        PublishingPiwigoSession* session,
+                                                        const gchar* category,
+                                                        gint parent_id,
+                                                        const gchar* comment)
+{
 	PublishingPiwigoCategoriesAddTransaction* self = NULL;
-	PublishingPiwigoSession* _tmp0_;
-	const gchar* _tmp1_;
-	gint _tmp2_;
-	const gchar* _tmp6_;
 #line 1698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
 #line 1698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (category != NULL, NULL);
 #line 1699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = session;
-#line 1699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self = (PublishingPiwigoCategoriesAddTransaction*) publishing_piwigo_transaction_construct_authenticated (object_type, _tmp0_);
+	self = (PublishingPiwigoCategoriesAddTransaction*) publishing_piwigo_transaction_construct_authenticated (object_type, session);
 #line 1701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.categories.add");
 #line 1702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = category;
-#line 1702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp1_);
-#line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = parent_id;
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", category);
 #line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (_tmp2_ != 0) {
-#line 12162 "PiwigoPublishing.c"
-		gint _tmp3_;
-		gchar* _tmp4_;
-		gchar* _tmp5_;
-#line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp3_ = parent_id;
+	if (parent_id != 0) {
+#line 12768 "PiwigoPublishing.c"
+		gchar* _tmp0_;
+		gchar* _tmp1_;
 #line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp4_ = g_strdup_printf ("%i", _tmp3_);
+		_tmp0_ = g_strdup_printf ("%i", parent_id);
 #line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp5_ = _tmp4_;
+		_tmp1_ = _tmp0_;
 #line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "parent", _tmp5_);
+		publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "parent", _tmp1_);
 #line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_free0 (_tmp5_);
-#line 12176 "PiwigoPublishing.c"
+		_g_free0 (_tmp1_);
+#line 12779 "PiwigoPublishing.c"
 	}
 #line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp6_ = comment;
-#line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (g_strcmp0 (_tmp6_, "") != 0) {
-#line 12182 "PiwigoPublishing.c"
-		const gchar* _tmp7_;
-#line 1709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp7_ = comment;
+	if (g_strcmp0 (comment, "") != 0) {
 #line 1709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp7_);
-#line 12188 "PiwigoPublishing.c"
+		publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", comment);
+#line 12785 "PiwigoPublishing.c"
 	}
 #line 1698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 12192 "PiwigoPublishing.c"
+#line 12789 "PiwigoPublishing.c"
 }
 
 
-PublishingPiwigoCategoriesAddTransaction* publishing_piwigo_categories_add_transaction_new (PublishingPiwigoSession* session, const gchar* category, gint parent_id, const gchar* comment) {
+PublishingPiwigoCategoriesAddTransaction*
+publishing_piwigo_categories_add_transaction_new (PublishingPiwigoSession* session,
+                                                  const gchar* category,
+                                                  gint parent_id,
+                                                  const gchar* comment)
+{
 #line 1698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_categories_add_transaction_construct (PUBLISHING_PIWIGO_TYPE_CATEGORIES_ADD_TRANSACTION, session, category, parent_id, comment);
-#line 12199 "PiwigoPublishing.c"
+#line 12801 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_categories_add_transaction_class_init (PublishingPiwigoCategoriesAddTransactionClass * klass) {
+static void
+publishing_piwigo_categories_add_transaction_class_init (PublishingPiwigoCategoriesAddTransactionClass * klass)
+{
 #line 1697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_categories_add_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 12206 "PiwigoPublishing.c"
+#line 12810 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_categories_add_transaction_instance_init (PublishingPiwigoCategoriesAddTransaction * self) {
+static void
+publishing_piwigo_categories_add_transaction_instance_init (PublishingPiwigoCategoriesAddTransaction * self)
+{
 }
 
 
-GType publishing_piwigo_categories_add_transaction_get_type (void) {
+GType
+publishing_piwigo_categories_add_transaction_get_type (void)
+{
 	static volatile gsize publishing_piwigo_categories_add_transaction_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_piwigo_categories_add_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingPiwigoCategoriesAddTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_piwigo_categories_add_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPiwigoCategoriesAddTransaction), 0, (GInstanceInitFunc) publishing_piwigo_categories_add_transaction_instance_init, NULL };
@@ -12237,496 +12845,398 @@ GType publishing_piwigo_categories_add_transaction_get_type (void) {
 }
 
 
-static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int str_array_length1) {
+static gchar*
+_vala_g_strjoinv (const gchar* separator,
+                  gchar** str_array,
+                  int str_array_length1)
+{
 	gchar* result = NULL;
-	const gchar* _tmp0_;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-	gchar** _tmp3_;
-	gint _tmp3__length1;
-#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = separator;
-#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp0_ == NULL) {
-#line 1079 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	gboolean _tmp0_ = FALSE;
+#line 1092 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (separator == NULL) {
+#line 1093 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		separator = "";
-#line 12239 "PiwigoPublishing.c"
-	}
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp3_ = str_array;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp3__length1 = str_array_length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp3_ != NULL) {
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp2_ = TRUE;
-#line 12249 "PiwigoPublishing.c"
-	} else {
-		gchar** _tmp4_;
-		gint _tmp4__length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4_ = str_array;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4__length1 = str_array_length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp2_ = _tmp4__length1 > 0;
-#line 12259 "PiwigoPublishing.c"
-	}
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp2_) {
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp1_ = TRUE;
-#line 12265 "PiwigoPublishing.c"
-	} else {
-		gboolean _tmp5_ = FALSE;
-		gchar** _tmp6_;
-		gint _tmp6__length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp6_ = str_array;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp6__length1 = str_array_length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		if (_tmp6__length1 == -1) {
-#line 12276 "PiwigoPublishing.c"
-			gchar** _tmp7_;
-			gint _tmp7__length1;
-			const gchar* _tmp8_;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp7_ = str_array;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp7__length1 = str_array_length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp8_ = _tmp7_[0];
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp5_ = _tmp8_ != NULL;
-#line 12288 "PiwigoPublishing.c"
+#line 12845 "PiwigoPublishing.c"
+	}
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (str_array != NULL) {
+#line 12849 "PiwigoPublishing.c"
+		gboolean _tmp1_ = FALSE;
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		if (str_array_length1 > 0) {
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+			_tmp1_ = TRUE;
+#line 12855 "PiwigoPublishing.c"
 		} else {
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp5_ = FALSE;
-#line 12292 "PiwigoPublishing.c"
+			gboolean _tmp2_ = FALSE;
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+			if (str_array_length1 == -1) {
+#line 12860 "PiwigoPublishing.c"
+				const gchar* _tmp3_;
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp3_ = str_array[0];
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp2_ = _tmp3_ != NULL;
+#line 12866 "PiwigoPublishing.c"
+			} else {
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp2_ = FALSE;
+#line 12870 "PiwigoPublishing.c"
+			}
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+			_tmp1_ = _tmp2_;
+#line 12874 "PiwigoPublishing.c"
 		}
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp1_ = _tmp5_;
-#line 12296 "PiwigoPublishing.c"
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp0_ = _tmp1_;
+#line 12878 "PiwigoPublishing.c"
+	} else {
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp0_ = FALSE;
+#line 12882 "PiwigoPublishing.c"
 	}
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp1_) {
-#line 12300 "PiwigoPublishing.c"
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (_tmp0_) {
+#line 12886 "PiwigoPublishing.c"
 		gint i = 0;
 		gsize len = 0UL;
-		gint _tmp31_;
-		gint _tmp33_;
-		gint _tmp34_;
-		gsize _tmp35_;
-		const gchar* _tmp36_;
-		gint _tmp37_;
-		gint _tmp38_;
-		gint _tmp39_;
+		gint _tmp20_;
+		gint _tmp22_;
+		gint _tmp23_;
+		gsize _tmp24_;
+		gint _tmp25_;
+		gint _tmp26_;
+		gint _tmp27_;
 		const gchar* res = NULL;
-		gsize _tmp40_;
-		void* _tmp41_;
+		gsize _tmp28_;
+		void* _tmp29_;
 		void* ptr = NULL;
-		const gchar* _tmp42_;
-		gchar** _tmp43_;
-		gint _tmp43__length1;
-		const gchar* _tmp44_;
-		void* _tmp45_;
-		const gchar* _tmp62_;
-#line 1083 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		const gchar* _tmp30_;
+		const gchar* _tmp31_;
+		void* _tmp32_;
+		const gchar* _tmp45_;
+#line 1097 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		len = (gsize) 1;
-#line 12323 "PiwigoPublishing.c"
+#line 12906 "PiwigoPublishing.c"
 		{
-			gboolean _tmp9_ = FALSE;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+			gboolean _tmp4_ = FALSE;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			i = 0;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp9_ = TRUE;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+			_tmp4_ = TRUE;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			while (TRUE) {
-#line 12332 "PiwigoPublishing.c"
-				gboolean _tmp11_ = FALSE;
-				gboolean _tmp12_ = FALSE;
-				gchar** _tmp13_;
-				gint _tmp13__length1;
-				gint _tmp21_ = 0;
-				gchar** _tmp22_;
-				gint _tmp22__length1;
-				gint _tmp23_;
-				const gchar* _tmp24_;
-				gsize _tmp30_;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (!_tmp9_) {
-#line 12345 "PiwigoPublishing.c"
-					gint _tmp10_;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp10_ = i;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					i = _tmp10_ + 1;
-#line 12351 "PiwigoPublishing.c"
+#line 12915 "PiwigoPublishing.c"
+				gboolean _tmp6_ = FALSE;
+				gboolean _tmp7_ = FALSE;
+				gint _tmp12_ = 0;
+				gint _tmp13_;
+				const gchar* _tmp14_;
+				gsize _tmp19_;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				if (!_tmp4_) {
+#line 12924 "PiwigoPublishing.c"
+					gint _tmp5_;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp5_ = i;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					i = _tmp5_ + 1;
+#line 12930 "PiwigoPublishing.c"
 				}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp9_ = FALSE;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp13_ = str_array;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp13__length1 = str_array_length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (_tmp13__length1 != -1) {
-#line 12361 "PiwigoPublishing.c"
-					gint _tmp14_;
-					gchar** _tmp15_;
-					gint _tmp15__length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp14_ = i;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp15_ = str_array;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp15__length1 = str_array_length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp12_ = _tmp14_ < _tmp15__length1;
-#line 12373 "PiwigoPublishing.c"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp4_ = FALSE;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				if (str_array_length1 != -1) {
+#line 12936 "PiwigoPublishing.c"
+					gint _tmp8_;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp8_ = i;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp7_ = _tmp8_ < str_array_length1;
+#line 12942 "PiwigoPublishing.c"
 				} else {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp12_ = FALSE;
-#line 12377 "PiwigoPublishing.c"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp7_ = FALSE;
+#line 12946 "PiwigoPublishing.c"
 				}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (_tmp12_) {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp11_ = TRUE;
-#line 12383 "PiwigoPublishing.c"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				if (_tmp7_) {
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp6_ = TRUE;
+#line 12952 "PiwigoPublishing.c"
 				} else {
-					gboolean _tmp16_ = FALSE;
-					gchar** _tmp17_;
-					gint _tmp17__length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp17_ = str_array;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp17__length1 = str_array_length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					if (_tmp17__length1 == -1) {
-#line 12394 "PiwigoPublishing.c"
-						gchar** _tmp18_;
-						gint _tmp18__length1;
-						gint _tmp19_;
-						const gchar* _tmp20_;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-						_tmp18_ = str_array;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-						_tmp18__length1 = str_array_length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-						_tmp19_ = i;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-						_tmp20_ = _tmp18_[_tmp19_];
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-						_tmp16_ = _tmp20_ != NULL;
-#line 12409 "PiwigoPublishing.c"
+					gboolean _tmp9_ = FALSE;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					if (str_array_length1 == -1) {
+#line 12957 "PiwigoPublishing.c"
+						gint _tmp10_;
+						const gchar* _tmp11_;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+						_tmp10_ = i;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+						_tmp11_ = str_array[_tmp10_];
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+						_tmp9_ = _tmp11_ != NULL;
+#line 12966 "PiwigoPublishing.c"
 					} else {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-						_tmp16_ = FALSE;
-#line 12413 "PiwigoPublishing.c"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+						_tmp9_ = FALSE;
+#line 12970 "PiwigoPublishing.c"
 					}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp11_ = _tmp16_;
-#line 12417 "PiwigoPublishing.c"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp6_ = _tmp9_;
+#line 12974 "PiwigoPublishing.c"
 				}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (!_tmp11_) {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				if (!_tmp6_) {
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 					break;
-#line 12423 "PiwigoPublishing.c"
+#line 12980 "PiwigoPublishing.c"
 				}
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp22_ = str_array;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp22__length1 = str_array_length1;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp23_ = i;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp24_ = _tmp22_[_tmp23_];
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (_tmp24_ != NULL) {
-#line 12435 "PiwigoPublishing.c"
-					gchar** _tmp25_;
-					gint _tmp25__length1;
-					gint _tmp26_;
-					const gchar* _tmp27_;
-					gint _tmp28_;
-					gint _tmp29_;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp25_ = str_array;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp25__length1 = str_array_length1;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp26_ = i;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp27_ = _tmp25_[_tmp26_];
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp28_ = strlen ((const gchar*) _tmp27_);
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp29_ = _tmp28_;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp21_ = _tmp29_;
-#line 12456 "PiwigoPublishing.c"
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp13_ = i;
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp14_ = str_array[_tmp13_];
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				if (_tmp14_ != NULL) {
+#line 12988 "PiwigoPublishing.c"
+					gint _tmp15_;
+					const gchar* _tmp16_;
+					gint _tmp17_;
+					gint _tmp18_;
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp15_ = i;
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp16_ = str_array[_tmp15_];
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp17_ = strlen ((const gchar*) _tmp16_);
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp18_ = _tmp17_;
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp12_ = _tmp18_;
+#line 13003 "PiwigoPublishing.c"
 				} else {
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp21_ = 0;
-#line 12460 "PiwigoPublishing.c"
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp12_ = 0;
+#line 13007 "PiwigoPublishing.c"
 				}
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp30_ = len;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				len = _tmp30_ + _tmp21_;
-#line 12466 "PiwigoPublishing.c"
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp19_ = len;
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				len = _tmp19_ + _tmp12_;
+#line 13013 "PiwigoPublishing.c"
 			}
 		}
-#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp31_ = i;
-#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		if (_tmp31_ == 0) {
-#line 12473 "PiwigoPublishing.c"
-			gchar* _tmp32_;
-#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp32_ = g_strdup ("");
-#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			result = _tmp32_;
-#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1101 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp20_ = i;
+#line 1101 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		if (_tmp20_ == 0) {
+#line 13020 "PiwigoPublishing.c"
+			gchar* _tmp21_;
+#line 1102 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+			_tmp21_ = g_strdup ("");
+#line 1102 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+			result = _tmp21_;
+#line 1102 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			return result;
-#line 12481 "PiwigoPublishing.c"
+#line 13028 "PiwigoPublishing.c"
 		}
-#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp33_ = i;
-#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		str_array_length1 = _tmp33_;
-#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp34_ = str_array_length1;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp35_ = len;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp36_ = separator;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp37_ = strlen ((const gchar*) _tmp36_);
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp38_ = _tmp37_;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp39_ = i;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1));
-#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp40_ = len;
-#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp41_ = g_malloc (_tmp40_);
-#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		res = _tmp41_;
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp42_ = res;
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp43_ = str_array;
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp43__length1 = str_array_length1;
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp44_ = _tmp43_[0];
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		ptr = _tmp45_;
-#line 12519 "PiwigoPublishing.c"
+#line 1104 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp22_ = i;
+#line 1104 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		str_array_length1 = _tmp22_;
+#line 1104 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp23_ = str_array_length1;
+#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp24_ = len;
+#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp25_ = strlen ((const gchar*) separator);
+#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp26_ = _tmp25_;
+#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp27_ = i;
+#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		len = _tmp24_ + (_tmp26_ * (_tmp27_ - 1));
+#line 1107 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp28_ = len;
+#line 1107 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp29_ = g_malloc (_tmp28_);
+#line 1107 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		res = _tmp29_;
+#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp30_ = res;
+#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp31_ = str_array[0];
+#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp32_ = g_stpcpy ((void*) _tmp30_, (const gchar*) _tmp31_);
+#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		ptr = _tmp32_;
+#line 13060 "PiwigoPublishing.c"
 		{
-			gboolean _tmp46_ = FALSE;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+			gboolean _tmp33_ = FALSE;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			i = 1;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp46_ = TRUE;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+			_tmp33_ = TRUE;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			while (TRUE) {
-#line 12528 "PiwigoPublishing.c"
-				gint _tmp48_;
-				gchar** _tmp49_;
-				gint _tmp49__length1;
-				void* _tmp50_;
-				const gchar* _tmp51_;
-				void* _tmp52_;
-				const gchar* _tmp53_ = NULL;
-				gchar** _tmp54_;
-				gint _tmp54__length1;
-				gint _tmp55_;
-				const gchar* _tmp56_;
-				void* _tmp60_;
-				void* _tmp61_;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (!_tmp46_) {
-#line 12544 "PiwigoPublishing.c"
-					gint _tmp47_;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp47_ = i;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					i = _tmp47_ + 1;
-#line 12550 "PiwigoPublishing.c"
+#line 13069 "PiwigoPublishing.c"
+				gint _tmp35_;
+				void* _tmp36_;
+				void* _tmp37_;
+				const gchar* _tmp38_ = NULL;
+				gint _tmp39_;
+				const gchar* _tmp40_;
+				void* _tmp43_;
+				void* _tmp44_;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				if (!_tmp33_) {
+#line 13080 "PiwigoPublishing.c"
+					gint _tmp34_;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp34_ = i;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					i = _tmp34_ + 1;
+#line 13086 "PiwigoPublishing.c"
 				}
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp46_ = FALSE;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp48_ = i;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp49_ = str_array;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp49__length1 = str_array_length1;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (!(_tmp48_ < _tmp49__length1)) {
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp33_ = FALSE;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp35_ = i;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				if (!(_tmp35_ < str_array_length1)) {
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 					break;
-#line 12564 "PiwigoPublishing.c"
+#line 13096 "PiwigoPublishing.c"
 				}
-#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp50_ = ptr;
-#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp51_ = separator;
-#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_);
-#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				ptr = _tmp52_;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp54_ = str_array;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp54__length1 = str_array_length1;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp55_ = i;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp56_ = _tmp54_[_tmp55_];
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (_tmp56_ != NULL) {
-#line 12584 "PiwigoPublishing.c"
-					gchar** _tmp57_;
-					gint _tmp57__length1;
-					gint _tmp58_;
-					const gchar* _tmp59_;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp57_ = str_array;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp57__length1 = str_array_length1;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp58_ = i;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp59_ = _tmp57_[_tmp58_];
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp53_ = (const gchar*) _tmp59_;
-#line 12599 "PiwigoPublishing.c"
+#line 1110 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp36_ = ptr;
+#line 1110 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp37_ = g_stpcpy (_tmp36_, (const gchar*) separator);
+#line 1110 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				ptr = _tmp37_;
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp39_ = i;
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp40_ = str_array[_tmp39_];
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				if (_tmp40_ != NULL) {
+#line 13110 "PiwigoPublishing.c"
+					gint _tmp41_;
+					const gchar* _tmp42_;
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp41_ = i;
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp42_ = str_array[_tmp41_];
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp38_ = (const gchar*) _tmp42_;
+#line 13119 "PiwigoPublishing.c"
 				} else {
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp53_ = "";
-#line 12603 "PiwigoPublishing.c"
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp38_ = "";
+#line 13123 "PiwigoPublishing.c"
 				}
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp60_ = ptr;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				ptr = _tmp61_;
-#line 12611 "PiwigoPublishing.c"
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp43_ = ptr;
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp44_ = g_stpcpy (_tmp43_, _tmp38_);
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				ptr = _tmp44_;
+#line 13131 "PiwigoPublishing.c"
 			}
 		}
-#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp62_ = res;
-#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp45_ = res;
+#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		res = NULL;
-#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = (gchar*) _tmp62_;
-#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		result = (gchar*) _tmp45_;
+#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return result;
-#line 12622 "PiwigoPublishing.c"
+#line 13142 "PiwigoPublishing.c"
 	} else {
-		gchar* _tmp63_;
-#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp63_ = g_strdup ("");
-#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = _tmp63_;
-#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		gchar* _tmp46_;
+#line 1116 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp46_ = g_strdup ("");
+#line 1116 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		result = _tmp46_;
+#line 1116 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return result;
-#line 12631 "PiwigoPublishing.c"
+#line 13151 "PiwigoPublishing.c"
 	}
 }
 
 
-static void _g_free0_ (gpointer var) {
+static void
+_g_free0_ (gpointer var)
+{
 #line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	var = (g_free (var), NULL);
-#line 12639 "PiwigoPublishing.c"
+#line 13161 "PiwigoPublishing.c"
 }
 
 
-PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_construct (GType object_type, PublishingPiwigoSession* session, PublishingPiwigoPublishingParameters* parameters, SpitPublishingPublishable* publishable) {
+PublishingPiwigoImagesAddTransaction*
+publishing_piwigo_images_add_transaction_construct (GType object_type,
+                                                    PublishingPiwigoSession* session,
+                                                    PublishingPiwigoPublishingParameters* parameters,
+                                                    SpitPublishingPublishable* publishable)
+{
 	PublishingPiwigoImagesAddTransaction* self = NULL;
-	PublishingPiwigoSession* _tmp0_;
-	SpitPublishingPublishable* _tmp1_;
-	PublishingPiwigoSession* _tmp2_;
-	gchar* _tmp3_;
-	gchar* _tmp4_;
-	PublishingPiwigoSession* _tmp5_;
-	gboolean _tmp6_;
-	PublishingPiwigoPublishingParameters* _tmp12_;
-	PublishingPiwigoPublishingParameters* _tmp13_;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	PublishingPiwigoPublishingParameters* _tmp6_;
 	gchar** keywords = NULL;
-	SpitPublishingPublishable* _tmp14_;
-	gint _tmp15_;
-	gchar** _tmp16_;
+	gint _tmp7_;
+	gchar** _tmp8_;
 	gint keywords_length1;
 	gint _keywords_size_;
 	gchar* tags = NULL;
-	gchar* _tmp17_;
-	gchar** _tmp18_;
-	gint _tmp18__length1;
-	SpitPublishingPublishable* _tmp21_;
-	GFile* _tmp22_;
-	GFile* _tmp23_;
-	gchar* _tmp24_;
-	gchar* _tmp25_;
-	PublishingPiwigoPublishingParameters* _tmp26_;
-	PublishingPiwigoCategory* _tmp27_;
-	gint _tmp28_;
-	PublishingPiwigoPublishingParameters* _tmp29_;
-	PublishingPiwigoPermissionLevel* _tmp30_;
-	gint _tmp31_;
+	gchar* _tmp9_;
+	gchar** _tmp10_;
+	gint _tmp10__length1;
+	GFile* _tmp13_;
+	GFile* _tmp14_;
+	gchar* _tmp15_;
+	gchar* _tmp16_;
+	PublishingPiwigoCategory* _tmp17_;
+	gint _tmp18_;
+	PublishingPiwigoPermissionLevel* _tmp19_;
+	gint _tmp20_;
 	gchar* name = NULL;
-	SpitPublishingPublishable* _tmp32_;
-	gchar* _tmp33_;
+	gchar* _tmp21_;
 	gchar* comment = NULL;
-	SpitPublishingPublishable* _tmp34_;
-	gchar* _tmp35_;
-	gboolean _tmp36_ = FALSE;
-	const gchar* _tmp37_;
-	PublishingPiwigoPublishingParameters* _tmp55_;
-	PublishingPiwigoCategory* _tmp56_;
-	gint _tmp57_;
-	gchar* _tmp58_;
-	gchar* _tmp59_;
-	PublishingPiwigoPublishingParameters* _tmp60_;
-	PublishingPiwigoPermissionLevel* _tmp61_;
-	gint _tmp62_;
-	gchar* _tmp63_;
-	gchar* _tmp64_;
-	PublishingPiwigoPublishingParameters* _tmp65_;
-	gboolean _tmp66_;
+	gchar* _tmp22_;
+	gboolean _tmp23_ = FALSE;
+	const gchar* _tmp24_;
+	PublishingPiwigoCategory* _tmp40_;
+	gint _tmp41_;
+	gchar* _tmp42_;
+	gchar* _tmp43_;
+	PublishingPiwigoPermissionLevel* _tmp44_;
+	gint _tmp45_;
+	gchar* _tmp46_;
+	gchar* _tmp47_;
+	gboolean _tmp48_;
 	GHashTable* disposition_table = NULL;
-	GHashFunc _tmp69_;
-	GEqualFunc _tmp70_;
-	GHashTable* _tmp71_;
+	GHashFunc _tmp51_;
+	GEqualFunc _tmp52_;
+	GHashTable* _tmp53_;
 	gchar* basename = NULL;
-	SpitPublishingPublishable* _tmp72_;
-	gchar* _tmp73_;
-	gboolean _tmp74_ = FALSE;
-	const gchar* _tmp75_;
-	gchar* _tmp76_;
-	gchar* _tmp77_;
-	gboolean _tmp78_;
-	gboolean _tmp79_;
-	GHashTable* _tmp86_;
-	gchar* _tmp87_;
-	const gchar* _tmp88_;
-	gchar* _tmp89_;
-	GHashTable* _tmp90_;
-	gchar* _tmp91_;
-	gchar* _tmp92_;
-	GHashTable* _tmp93_;
+	gchar* _tmp54_;
+	gboolean _tmp55_ = FALSE;
+	const gchar* _tmp56_;
+	gchar* _tmp57_;
+	gchar* _tmp58_;
+	gboolean _tmp59_;
+	GHashTable* _tmp65_;
+	gchar* _tmp66_;
+	const gchar* _tmp67_;
+	gchar* _tmp68_;
+	GHashTable* _tmp69_;
+	gchar* _tmp70_;
+	gchar* _tmp71_;
+	GHashTable* _tmp72_;
 #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"
@@ -12734,393 +13244,347 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 #line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
 #line 1718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = session;
+	_tmp0_ = publishing_piwigo_session_get_pwg_url (session);
 #line 1718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = publishable;
-#line 1718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = session;
-#line 1718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp3_ = publishing_piwigo_session_get_pwg_url (_tmp2_);
-#line 1718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp4_ = _tmp3_;
+	_tmp1_ = _tmp0_;
 #line 1718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self = (PublishingPiwigoImagesAddTransaction*) publishing_rest_support_upload_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp4_);
+	self = (PublishingPiwigoImagesAddTransaction*) publishing_rest_support_upload_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), publishable, _tmp1_);
 #line 1718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_free0 (_tmp4_);
-#line 1719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp5_ = session;
-#line 1719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
+	_g_free0 (_tmp1_);
 #line 1719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (_tmp6_) {
-#line 12742 "PiwigoPublishing.c"
-		PublishingPiwigoSession* _tmp7_;
-		gchar* _tmp8_;
-		gchar* _tmp9_;
-		gchar* _tmp10_;
-		gchar* _tmp11_;
-#line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp7_ = session;
+	if (publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
+#line 13242 "PiwigoPublishing.c"
+		gchar* _tmp2_;
+		gchar* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
 #line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp8_ = publishing_piwigo_session_get_pwg_id (_tmp7_);
+		_tmp2_ = publishing_piwigo_session_get_pwg_id (session);
 #line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp9_ = _tmp8_;
+		_tmp3_ = _tmp2_;
 #line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp10_ = g_strconcat ("pwg_id=", _tmp9_, NULL);
+		_tmp4_ = g_strconcat ("pwg_id=", _tmp3_, NULL);
 #line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp11_ = _tmp10_;
+		_tmp5_ = _tmp4_;
 #line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Cookie", _tmp11_);
+		publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Cookie", _tmp5_);
 #line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_free0 (_tmp11_);
+		_g_free0 (_tmp5_);
 #line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_free0 (_tmp9_);
-#line 12764 "PiwigoPublishing.c"
+		_g_free0 (_tmp3_);
+#line 13261 "PiwigoPublishing.c"
 	}
 #line 1722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp12_ = parameters;
-#line 1722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp13_ = _publishing_piwigo_publishing_parameters_ref0 (_tmp12_);
+	_tmp6_ = _publishing_piwigo_publishing_parameters_ref0 (parameters);
 #line 1722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_piwigo_publishing_parameters_unref0 (self->priv->parameters);
 #line 1722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->parameters = _tmp13_;
-#line 1724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp14_ = publishable;
+	self->priv->parameters = _tmp6_;
 #line 1724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp16_ = spit_publishing_publishable_get_publishing_keywords (_tmp14_, &_tmp15_);
+	_tmp8_ = spit_publishing_publishable_get_publishing_keywords (publishable, &_tmp7_);
 #line 1724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	keywords = _tmp16_;
+	keywords = _tmp8_;
 #line 1724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	keywords_length1 = _tmp15_;
+	keywords_length1 = _tmp7_;
 #line 1724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_keywords_size_ = keywords_length1;
 #line 1725 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp17_ = g_strdup ("");
+	_tmp9_ = g_strdup ("");
 #line 1725 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	tags = _tmp17_;
+	tags = _tmp9_;
 #line 1726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp18_ = keywords;
+	_tmp10_ = keywords;
 #line 1726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp18__length1 = keywords_length1;
+	_tmp10__length1 = keywords_length1;
 #line 1726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (_tmp18_ != NULL) {
-#line 12794 "PiwigoPublishing.c"
-		gchar** _tmp19_;
-		gint _tmp19__length1;
-		gchar* _tmp20_;
+	if (_tmp10_ != NULL) {
+#line 13287 "PiwigoPublishing.c"
+		gchar** _tmp11_;
+		gint _tmp11__length1;
+		gchar* _tmp12_;
 #line 1727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp19_ = keywords;
+		_tmp11_ = keywords;
 #line 1727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp19__length1 = keywords_length1;
+		_tmp11__length1 = keywords_length1;
 #line 1727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp20_ = _vala_g_strjoinv (",", _tmp19_, _tmp19__length1);
+		_tmp12_ = _vala_g_strjoinv (",", _tmp11_, _tmp11__length1);
 #line 1727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (tags);
 #line 1727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		tags = _tmp20_;
-#line 12808 "PiwigoPublishing.c"
+		tags = _tmp12_;
+#line 13301 "PiwigoPublishing.c"
 	}
 #line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp21_ = publishable;
-#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp22_ = spit_publishing_publishable_get_serialized_file (_tmp21_);
+	_tmp13_ = spit_publishing_publishable_get_serialized_file (publishable);
 #line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp23_ = _tmp22_;
-#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp24_ = g_file_get_basename (_tmp23_);
-#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp25_ = _tmp24_;
+	_tmp14_ = _tmp13_;
 #line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp26_ = parameters;
+	_tmp15_ = g_file_get_basename (_tmp14_);
 #line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp27_ = _tmp26_->category;
+	_tmp16_ = _tmp15_;
 #line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp28_ = _tmp27_->id;
+	_tmp17_ = parameters->category;
 #line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp29_ = parameters;
+	_tmp18_ = _tmp17_->id;
 #line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp30_ = _tmp29_->perm_level;
+	_tmp19_ = parameters->perm_level;
 #line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp31_ = _tmp30_->id;
+	_tmp20_ = _tmp19_->id;
 #line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_debug ("PiwigoPublishing.vala:1730: PiwigoConnector: Uploading photo %s to cat" \
-"egory id %d with perm level %d", _tmp25_, _tmp28_, _tmp31_);
+"egory id %d with perm level %d", _tmp16_, _tmp18_, _tmp20_);
 #line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_free0 (_tmp25_);
+	_g_free0 (_tmp16_);
 #line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_object_unref0 (_tmp23_);
-#line 1733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp32_ = publishable;
+	_g_object_unref0 (_tmp14_);
 #line 1733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp33_ = spit_publishing_publishable_get_publishing_name (_tmp32_);
+	_tmp21_ = spit_publishing_publishable_get_publishing_name (publishable);
 #line 1733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	name = _tmp33_;
+	name = _tmp21_;
 #line 1734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp34_ = publishable;
+	_tmp22_ = spit_publishing_publishable_get_param_string (publishable, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_COMMENT);
 #line 1734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp35_ = spit_publishing_publishable_get_param_string (_tmp34_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_COMMENT);
-#line 1734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	comment = _tmp35_;
+	comment = _tmp22_;
 #line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp37_ = name;
+	_tmp24_ = name;
 #line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (_tmp37_ == NULL) {
+	if (_tmp24_ == NULL) {
 #line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp36_ = TRUE;
-#line 12856 "PiwigoPublishing.c"
+		_tmp23_ = TRUE;
+#line 13339 "PiwigoPublishing.c"
 	} else {
-		const gchar* _tmp38_;
+		const gchar* _tmp25_;
 #line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp38_ = name;
+		_tmp25_ = name;
 #line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp36_ = g_strcmp0 (_tmp38_, "") == 0;
-#line 12863 "PiwigoPublishing.c"
+		_tmp23_ = g_strcmp0 (_tmp25_, "") == 0;
+#line 13346 "PiwigoPublishing.c"
 	}
 #line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (_tmp36_) {
-#line 12867 "PiwigoPublishing.c"
-		SpitPublishingPublishable* _tmp39_;
-		gchar* _tmp40_;
-		const gchar* _tmp41_;
-		gboolean _tmp42_ = FALSE;
-		const gchar* _tmp43_;
-#line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp39_ = publishable;
+	if (_tmp23_) {
+#line 13350 "PiwigoPublishing.c"
+		gchar* _tmp26_;
+		const gchar* _tmp27_;
+		gboolean _tmp28_ = FALSE;
+		const gchar* _tmp29_;
 #line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp40_ = spit_publishing_publishable_get_param_string (_tmp39_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
+		_tmp26_ = spit_publishing_publishable_get_param_string (publishable, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
 #line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (name);
 #line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		name = _tmp40_;
+		name = _tmp26_;
 #line 1739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp41_ = name;
+		_tmp27_ = name;
 #line 1739 "/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", _tmp41_);
+		publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp27_);
 #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp43_ = comment;
+		_tmp29_ = comment;
 #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		if (_tmp43_ != NULL) {
-#line 12889 "PiwigoPublishing.c"
-			const gchar* _tmp44_;
+		if (_tmp29_ != NULL) {
+#line 13369 "PiwigoPublishing.c"
+			const gchar* _tmp30_;
 #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp44_ = comment;
+			_tmp30_ = comment;
 #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp42_ = g_strcmp0 (_tmp44_, "") != 0;
-#line 12895 "PiwigoPublishing.c"
+			_tmp28_ = g_strcmp0 (_tmp30_, "") != 0;
+#line 13375 "PiwigoPublishing.c"
 		} else {
 #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp42_ = FALSE;
-#line 12899 "PiwigoPublishing.c"
+			_tmp28_ = FALSE;
+#line 13379 "PiwigoPublishing.c"
 		}
 #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		if (_tmp42_) {
-#line 12903 "PiwigoPublishing.c"
-			const gchar* _tmp45_;
+		if (_tmp28_) {
+#line 13383 "PiwigoPublishing.c"
+			const gchar* _tmp31_;
 #line 1741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp45_ = comment;
+			_tmp31_ = 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 12909 "PiwigoPublishing.c"
+			publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp31_);
+#line 13389 "PiwigoPublishing.c"
 		}
 	} else {
-		gboolean _tmp46_ = FALSE;
-		const gchar* _tmp47_;
+		gboolean _tmp32_ = FALSE;
+		const gchar* _tmp33_;
 #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp47_ = comment;
+		_tmp33_ = comment;
 #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		if (_tmp47_ != NULL) {
-#line 12918 "PiwigoPublishing.c"
-			const gchar* _tmp48_;
+		if (_tmp33_ != NULL) {
+#line 13398 "PiwigoPublishing.c"
+			const gchar* _tmp34_;
 #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp48_ = comment;
+			_tmp34_ = comment;
 #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp46_ = g_strcmp0 (_tmp48_, "") != 0;
-#line 12924 "PiwigoPublishing.c"
+			_tmp32_ = g_strcmp0 (_tmp34_, "") != 0;
+#line 13404 "PiwigoPublishing.c"
 		} else {
 #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp46_ = FALSE;
-#line 12928 "PiwigoPublishing.c"
+			_tmp32_ = FALSE;
+#line 13408 "PiwigoPublishing.c"
 		}
 #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		if (_tmp46_) {
-#line 12932 "PiwigoPublishing.c"
-			const gchar* _tmp49_;
-			const gchar* _tmp50_;
+		if (_tmp32_) {
+#line 13412 "PiwigoPublishing.c"
+			const gchar* _tmp35_;
+			const gchar* _tmp36_;
 #line 1746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp49_ = name;
+			_tmp35_ = name;
 #line 1746 "/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", _tmp49_);
+			publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp35_);
 #line 1747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp50_ = comment;
+			_tmp36_ = 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 12943 "PiwigoPublishing.c"
+			publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp36_);
+#line 13423 "PiwigoPublishing.c"
 		} else {
-			PublishingPiwigoPublishingParameters* _tmp51_;
-			gboolean _tmp52_;
+			gboolean _tmp37_;
 #line 1752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp51_ = parameters;
+			_tmp37_ = parameters->title_as_comment;
 #line 1752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp52_ = _tmp51_->title_as_comment;
-#line 1752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			if (_tmp52_) {
-#line 12953 "PiwigoPublishing.c"
-				const gchar* _tmp53_;
+			if (_tmp37_) {
+#line 13430 "PiwigoPublishing.c"
+				const gchar* _tmp38_;
 #line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp53_ = name;
+				_tmp38_ = 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 12959 "PiwigoPublishing.c"
+				publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp38_);
+#line 13436 "PiwigoPublishing.c"
 			} else {
-				const gchar* _tmp54_;
+				const gchar* _tmp39_;
 #line 1755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp54_ = name;
+				_tmp39_ = 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 12966 "PiwigoPublishing.c"
+				publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp39_);
+#line 13443 "PiwigoPublishing.c"
 			}
 		}
 	}
 #line 1759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.images.addSimple");
 #line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp55_ = parameters;
+	_tmp40_ = parameters->category;
 #line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp56_ = _tmp55_->category;
+	_tmp41_ = _tmp40_->id;
 #line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp57_ = _tmp56_->id;
+	_tmp42_ = g_strdup_printf ("%i", _tmp41_);
 #line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp58_ = g_strdup_printf ("%i", _tmp57_);
+	_tmp43_ = _tmp42_;
 #line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp59_ = _tmp58_;
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "category", _tmp43_);
 #line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "category", _tmp59_);
-#line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_free0 (_tmp59_);
-#line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp60_ = parameters;
+	_g_free0 (_tmp43_);
 #line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp61_ = _tmp60_->perm_level;
+	_tmp44_ = parameters->perm_level;
 #line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp62_ = _tmp61_->id;
+	_tmp45_ = _tmp44_->id;
 #line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp63_ = g_strdup_printf ("%i", _tmp62_);
+	_tmp46_ = g_strdup_printf ("%i", _tmp45_);
 #line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp64_ = _tmp63_;
+	_tmp47_ = _tmp46_;
 #line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "level", _tmp64_);
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "level", _tmp47_);
 #line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_free0 (_tmp64_);
+	_g_free0 (_tmp47_);
 #line 1762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp65_ = parameters;
+	_tmp48_ = parameters->no_upload_tags;
 #line 1762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp66_ = _tmp65_->no_upload_tags;
-#line 1762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (!_tmp66_) {
-#line 13006 "PiwigoPublishing.c"
-		const gchar* _tmp67_;
+	if (!_tmp48_) {
+#line 13477 "PiwigoPublishing.c"
+		const gchar* _tmp49_;
 #line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp67_ = tags;
+		_tmp49_ = tags;
 #line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		if (g_strcmp0 (_tmp67_, "") != 0) {
-#line 13012 "PiwigoPublishing.c"
-			const gchar* _tmp68_;
+		if (g_strcmp0 (_tmp49_, "") != 0) {
+#line 13483 "PiwigoPublishing.c"
+			const gchar* _tmp50_;
 #line 1764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp68_ = tags;
+			_tmp50_ = 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 13018 "PiwigoPublishing.c"
+			publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "tags", _tmp50_);
+#line 13489 "PiwigoPublishing.c"
 		}
 	}
 #line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp69_ = g_str_hash;
+	_tmp51_ = g_str_hash;
 #line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp70_ = g_str_equal;
+	_tmp52_ = g_str_equal;
 #line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp71_ = g_hash_table_new_full (_tmp69_, _tmp70_, _g_free0_, _g_free0_);
+	_tmp53_ = g_hash_table_new_full (_tmp51_, _tmp52_, _g_free0_, _g_free0_);
 #line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	disposition_table = _tmp71_;
+	disposition_table = _tmp53_;
 #line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp72_ = publishable;
+	_tmp54_ = spit_publishing_publishable_get_param_string (publishable, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
 #line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_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"
-	basename = _tmp73_;
-#line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp75_ = basename;
+	basename = _tmp54_;
 #line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp76_ = g_utf8_strdown (_tmp75_, (gssize) -1);
+	_tmp56_ = basename;
 #line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp77_ = _tmp76_;
+	_tmp57_ = g_utf8_strdown (_tmp56_, (gssize) -1);
 #line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp78_ = g_str_has_suffix (_tmp77_, ".jpeg");
+	_tmp58_ = _tmp57_;
 #line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp79_ = !_tmp78_;
+	_tmp59_ = !g_str_has_suffix (_tmp58_, ".jpeg");
 #line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_free0 (_tmp77_);
+	_g_free0 (_tmp58_);
 #line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (_tmp79_) {
-#line 13049 "PiwigoPublishing.c"
-		const gchar* _tmp80_;
-		gchar* _tmp81_;
-		gchar* _tmp82_;
-		gboolean _tmp83_;
+	if (_tmp59_) {
+#line 13516 "PiwigoPublishing.c"
+		const gchar* _tmp60_;
+		gchar* _tmp61_;
+		gchar* _tmp62_;
 #line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp80_ = basename;
+		_tmp60_ = basename;
 #line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp81_ = g_utf8_strdown (_tmp80_, (gssize) -1);
+		_tmp61_ = g_utf8_strdown (_tmp60_, (gssize) -1);
 #line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp82_ = _tmp81_;
+		_tmp62_ = _tmp61_;
 #line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp83_ = g_str_has_suffix (_tmp82_, ".jpg");
+		_tmp55_ = !g_str_has_suffix (_tmp62_, ".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 13066 "PiwigoPublishing.c"
+		_g_free0 (_tmp62_);
+#line 13530 "PiwigoPublishing.c"
 	} else {
 #line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp74_ = FALSE;
-#line 13070 "PiwigoPublishing.c"
+		_tmp55_ = FALSE;
+#line 13534 "PiwigoPublishing.c"
 	}
 #line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (_tmp74_) {
-#line 13074 "PiwigoPublishing.c"
-		const gchar* _tmp84_;
-		gchar* _tmp85_;
+	if (_tmp55_) {
+#line 13538 "PiwigoPublishing.c"
+		const gchar* _tmp63_;
+		gchar* _tmp64_;
 #line 1779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp84_ = basename;
+		_tmp63_ = basename;
 #line 1779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp85_ = g_strconcat (_tmp84_, ".jpg", NULL);
+		_tmp64_ = g_strconcat (_tmp63_, ".jpg", NULL);
 #line 1779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (basename);
 #line 1779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		basename = _tmp85_;
-#line 13085 "PiwigoPublishing.c"
+		basename = _tmp64_;
+#line 13549 "PiwigoPublishing.c"
 	}
 #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp86_ = disposition_table;
+	_tmp65_ = disposition_table;
 #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp87_ = g_strdup ("filename");
+	_tmp66_ = g_strdup ("filename");
 #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp88_ = basename;
+	_tmp67_ = basename;
 #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp89_ = soup_uri_encode (_tmp88_, NULL);
+	_tmp68_ = soup_uri_encode (_tmp67_, NULL);
 #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_hash_table_insert (_tmp86_, _tmp87_, _tmp89_);
+	g_hash_table_insert (_tmp65_, _tmp66_, _tmp68_);
 #line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp90_ = disposition_table;
+	_tmp69_ = disposition_table;
 #line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp91_ = g_strdup ("name");
+	_tmp70_ = g_strdup ("name");
 #line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp92_ = g_strdup ("image");
+	_tmp71_ = g_strdup ("image");
 #line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_hash_table_insert (_tmp90_, _tmp91_, _tmp92_);
+	g_hash_table_insert (_tmp69_, _tmp70_, _tmp71_);
 #line 1784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp93_ = disposition_table;
+	_tmp72_ = 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_);
+	publishing_rest_support_upload_transaction_set_binary_disposition_table (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction), _tmp72_);
 #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"
@@ -13135,38 +13599,48 @@ 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 13123 "PiwigoPublishing.c"
+#line 13587 "PiwigoPublishing.c"
 }
 
 
-PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_new (PublishingPiwigoSession* session, PublishingPiwigoPublishingParameters* parameters, SpitPublishingPublishable* publishable) {
+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 13130 "PiwigoPublishing.c"
+#line 13598 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_images_add_transaction_class_init (PublishingPiwigoImagesAddTransactionClass * klass) {
+static void
+publishing_piwigo_images_add_transaction_class_init (PublishingPiwigoImagesAddTransactionClass * klass)
+{
 #line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_images_add_transaction_parent_class = g_type_class_peek_parent (klass);
 #line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	((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 13141 "PiwigoPublishing.c"
+#line 13611 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_images_add_transaction_instance_init (PublishingPiwigoImagesAddTransaction * self) {
+static void
+publishing_piwigo_images_add_transaction_instance_init (PublishingPiwigoImagesAddTransaction * self)
+{
 #line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	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 13150 "PiwigoPublishing.c"
+#line 13622 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_images_add_transaction_finalize (PublishingRESTSupportTransaction * obj) {
+static void
+publishing_piwigo_images_add_transaction_finalize (PublishingRESTSupportTransaction * obj)
+{
 	PublishingPiwigoImagesAddTransaction * self;
 #line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_IMAGES_ADD_TRANSACTION, PublishingPiwigoImagesAddTransaction);
@@ -13174,11 +13648,13 @@ 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 13162 "PiwigoPublishing.c"
+#line 13636 "PiwigoPublishing.c"
 }
 
 
-GType publishing_piwigo_images_add_transaction_get_type (void) {
+GType
+publishing_piwigo_images_add_transaction_get_type (void)
+{
 	static volatile gsize publishing_piwigo_images_add_transaction_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_piwigo_images_add_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingPiwigoImagesAddTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_piwigo_images_add_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPiwigoImagesAddTransaction), 0, (GInstanceInitFunc) publishing_piwigo_images_add_transaction_instance_init, NULL };
@@ -13190,7 +13666,11 @@ GType publishing_piwigo_images_add_transaction_get_type (void) {
 }
 
 
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_destroy (gpointer array,
+                     gint array_length,
+                     GDestroyNotify destroy_func)
+{
 	if ((array != NULL) && (destroy_func != NULL)) {
 		int i;
 		for (i = 0; i < array_length; i = i + 1) {
@@ -13202,13 +13682,19 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti
 }
 
 
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_free (gpointer array,
+                  gint array_length,
+                  GDestroyNotify destroy_func)
+{
 	_vala_array_destroy (array, array_length, destroy_func);
 	g_free (array);
 }
 
 
-static gint _vala_array_length (gpointer array) {
+static gint
+_vala_array_length (gpointer array)
+{
 	int length;
 	length = 0;
 	if (array) {
diff --git a/plugins/shotwell-publishing/PiwigoPublishing.vala b/plugins/shotwell-publishing/PiwigoPublishing.vala
index 15d118b..fcd0aee 100644
--- a/plugins/shotwell-publishing/PiwigoPublishing.vala
+++ b/plugins/shotwell-publishing/PiwigoPublishing.vala
@@ -1643,8 +1643,8 @@ internal class SessionLoginTransaction : Transaction {
         base.with_endpoint_url(session, url);
 
         add_argument("method", "pwg.session.login");
-        add_argument("username", username);
-        add_argument("password", password);
+        add_argument("username", Uri.escape_string(username));
+        add_argument("password", Uri.escape_string(password));
     }
 
     public SessionLoginTransaction.from_other (Session session, Transaction other) {
diff --git a/plugins/shotwell-publishing/TumblrPublishing.c b/plugins/shotwell-publishing/TumblrPublishing.c
new file mode 100644
index 0000000..862982d
--- /dev/null
+++ b/plugins/shotwell-publishing/TumblrPublishing.c
@@ -0,0 +1,5544 @@
+/* TumblrPublishing.c generated by valac 0.40.4, the Vala compiler
+ * generated from TumblrPublishing.vala, do not modify */
+
+/* Copyright 2012 BJA Electronics
+ * Author: Jeroen Arnoldus (b.j.arnoldus@bja-electronics.nl)
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ */
+
+
+#include <glib.h>
+#include <glib-object.h>
+#include <shotwell-plugin-dev-1.0.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <stdlib.h>
+#include <string.h>
+#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 <gee.h>
+#include <float.h>
+#include <math.h>
+#include <gtk/gtk.h>
+#include <libsoup/soup.h>
+#include <glib/gstdio.h>
+#include <gobject/gvaluecollector.h>
+
+
+#define TYPE_TUMBLR_SERVICE (tumblr_service_get_type ())
+#define TUMBLR_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_TUMBLR_SERVICE, TumblrService))
+#define TUMBLR_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_TUMBLR_SERVICE, TumblrServiceClass))
+#define IS_TUMBLR_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_TUMBLR_SERVICE))
+#define IS_TUMBLR_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_TUMBLR_SERVICE))
+#define TUMBLR_SERVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_TUMBLR_SERVICE, TumblrServiceClass))
+
+typedef struct _TumblrService TumblrService;
+typedef struct _TumblrServiceClass TumblrServiceClass;
+typedef struct _TumblrServicePrivate TumblrServicePrivate;
+enum  {
+	TUMBLR_SERVICE_0_PROPERTY,
+	TUMBLR_SERVICE_NUM_PROPERTIES
+};
+static GParamSpec* tumblr_service_properties[TUMBLR_SERVICE_NUM_PROPERTIES];
+#define _g_free0(var) (var = (g_free (var), NULL))
+
+#define PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER (publishing_tumblr_tumblr_publisher_get_type ())
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisher))
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisherClass))
+#define PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER))
+#define PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER))
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisherClass))
+
+typedef struct _PublishingTumblrTumblrPublisher PublishingTumblrTumblrPublisher;
+typedef struct _PublishingTumblrTumblrPublisherClass PublishingTumblrTumblrPublisherClass;
+
+#define PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY (publishing_tumblr_blog_entry_get_type ())
+#define PUBLISHING_TUMBLR_BLOG_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY, PublishingTumblrBlogEntry))
+#define PUBLISHING_TUMBLR_BLOG_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY, PublishingTumblrBlogEntryClass))
+#define PUBLISHING_TUMBLR_IS_BLOG_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY))
+#define PUBLISHING_TUMBLR_IS_BLOG_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY))
+#define PUBLISHING_TUMBLR_BLOG_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY, PublishingTumblrBlogEntryClass))
+
+typedef struct _PublishingTumblrBlogEntry PublishingTumblrBlogEntry;
+typedef struct _PublishingTumblrBlogEntryClass PublishingTumblrBlogEntryClass;
+typedef struct _PublishingTumblrBlogEntryPrivate PublishingTumblrBlogEntryPrivate;
+typedef struct _PublishingTumblrParamSpecBlogEntry PublishingTumblrParamSpecBlogEntry;
+
+#define PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY (publishing_tumblr_size_entry_get_type ())
+#define PUBLISHING_TUMBLR_SIZE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY, PublishingTumblrSizeEntry))
+#define PUBLISHING_TUMBLR_SIZE_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY, PublishingTumblrSizeEntryClass))
+#define PUBLISHING_TUMBLR_IS_SIZE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY))
+#define PUBLISHING_TUMBLR_IS_SIZE_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY))
+#define PUBLISHING_TUMBLR_SIZE_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY, PublishingTumblrSizeEntryClass))
+
+typedef struct _PublishingTumblrSizeEntry PublishingTumblrSizeEntry;
+typedef struct _PublishingTumblrSizeEntryClass PublishingTumblrSizeEntryClass;
+typedef struct _PublishingTumblrSizeEntryPrivate PublishingTumblrSizeEntryPrivate;
+typedef struct _PublishingTumblrParamSpecSizeEntry PublishingTumblrParamSpecSizeEntry;
+typedef struct _PublishingTumblrTumblrPublisherPrivate PublishingTumblrTumblrPublisherPrivate;
+
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE (publishing_tumblr_tumblr_publisher_publishing_options_pane_get_type ())
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane))
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPaneClass))
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE))
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE))
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPaneClass))
+
+typedef struct _PublishingTumblrTumblrPublisherPublishingOptionsPane PublishingTumblrTumblrPublisherPublishingOptionsPane;
+typedef struct _PublishingTumblrTumblrPublisherPublishingOptionsPaneClass PublishingTumblrTumblrPublisherPublishingOptionsPaneClass;
+enum  {
+	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_0_PROPERTY,
+	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_NUM_PROPERTIES
+};
+static GParamSpec* publishing_tumblr_tumblr_publisher_properties[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_NUM_PROPERTIES];
+#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 _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_TUMBLR_TUMBLR_PUBLISHER_TYPE_USER_INFO_FETCH_TRANSACTION (publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_get_type ())
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_USER_INFO_FETCH_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_USER_INFO_FETCH_TRANSACTION, PublishingTumblrTumblrPublisherUserInfoFetchTransaction))
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_USER_INFO_FETCH_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_USER_INFO_FETCH_TRANSACTION, PublishingTumblrTumblrPublisherUserInfoFetchTransactionClass))
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_USER_INFO_FETCH_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_USER_INFO_FETCH_TRANSACTION))
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_USER_INFO_FETCH_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_USER_INFO_FETCH_TRANSACTION))
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_USER_INFO_FETCH_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_USER_INFO_FETCH_TRANSACTION, PublishingTumblrTumblrPublisherUserInfoFetchTransactionClass))
+
+typedef struct _PublishingTumblrTumblrPublisherUserInfoFetchTransaction PublishingTumblrTumblrPublisherUserInfoFetchTransaction;
+typedef struct _PublishingTumblrTumblrPublisherUserInfoFetchTransactionClass PublishingTumblrTumblrPublisherUserInfoFetchTransactionClass;
+#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_regex_unref0(var) ((var == NULL) ? NULL : (var = (g_regex_unref (var), NULL)))
+#define _json_object_unref0(var) ((var == NULL) ? NULL : (var = (json_object_unref (var), NULL)))
+#define _g_list_free0(var) ((var == NULL) ? NULL : (var = (g_list_free (var), NULL)))
+#define _g_date_time_unref0(var) ((var == NULL) ? NULL : (var = (g_date_time_unref (var), NULL)))
+
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER (publishing_tumblr_tumblr_publisher_uploader_get_type ())
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOADER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, PublishingTumblrTumblrPublisherUploader))
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, PublishingTumblrTumblrPublisherUploaderClass))
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOADER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER))
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER))
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOADER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, PublishingTumblrTumblrPublisherUploaderClass))
+
+typedef struct _PublishingTumblrTumblrPublisherUploader PublishingTumblrTumblrPublisherUploader;
+typedef struct _PublishingTumblrTumblrPublisherUploaderClass PublishingTumblrTumblrPublisherUploaderClass;
+#define _publishing_rest_support_batch_uploader_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_batch_uploader_unref (var), NULL)))
+typedef struct _PublishingTumblrTumblrPublisherPublishingOptionsPanePrivate PublishingTumblrTumblrPublisherPublishingOptionsPanePrivate;
+enum  {
+	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_0_PROPERTY,
+	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_tumblr_tumblr_publisher_publishing_options_pane_properties[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_NUM_PROPERTIES];
+#define _publishing_tumblr_blog_entry_unref0(var) ((var == NULL) ? NULL : (var = (publishing_tumblr_blog_entry_unref (var), NULL)))
+#define _publishing_tumblr_size_entry_unref0(var) ((var == NULL) ? NULL : (var = (publishing_tumblr_size_entry_unref (var), NULL)))
+enum  {
+	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL,
+	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL,
+	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_NUM_SIGNALS
+};
+static guint publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_NUM_SIGNALS] = {0};
+typedef struct _PublishingTumblrTumblrPublisherUserInfoFetchTransactionPrivate PublishingTumblrTumblrPublisherUserInfoFetchTransactionPrivate;
+
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION (publishing_tumblr_tumblr_publisher_upload_transaction_get_type ())
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOAD_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION, PublishingTumblrTumblrPublisherUploadTransaction))
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOAD_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION, PublishingTumblrTumblrPublisherUploadTransactionClass))
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOAD_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION))
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOAD_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION))
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOAD_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION, PublishingTumblrTumblrPublisherUploadTransactionClass))
+
+typedef struct _PublishingTumblrTumblrPublisherUploadTransaction PublishingTumblrTumblrPublisherUploadTransaction;
+typedef struct _PublishingTumblrTumblrPublisherUploadTransactionClass PublishingTumblrTumblrPublisherUploadTransactionClass;
+typedef struct _PublishingTumblrTumblrPublisherUploadTransactionPrivate PublishingTumblrTumblrPublisherUploadTransactionPrivate;
+#define _g_string_free0(var) ((var == NULL) ? NULL : (var = (g_string_free (var, TRUE), NULL)))
+typedef struct _PublishingTumblrTumblrPublisherUploaderPrivate PublishingTumblrTumblrPublisherUploaderPrivate;
+#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; }
+#define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
+#define _vala_warn_if_fail(expr, msg) if G_LIKELY (expr) ; else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
+
+struct _TumblrService {
+	GObject parent_instance;
+	TumblrServicePrivate * priv;
+};
+
+struct _TumblrServiceClass {
+	GObjectClass parent_class;
+};
+
+struct _PublishingTumblrBlogEntry {
+	GTypeInstance parent_instance;
+	volatile int ref_count;
+	PublishingTumblrBlogEntryPrivate * priv;
+	gchar* blog;
+	gchar* url;
+};
+
+struct _PublishingTumblrBlogEntryClass {
+	GTypeClass parent_class;
+	void (*finalize) (PublishingTumblrBlogEntry *self);
+};
+
+struct _PublishingTumblrParamSpecBlogEntry {
+	GParamSpec parent_instance;
+};
+
+struct _PublishingTumblrSizeEntry {
+	GTypeInstance parent_instance;
+	volatile int ref_count;
+	PublishingTumblrSizeEntryPrivate * priv;
+	gchar* title;
+	gint size;
+};
+
+struct _PublishingTumblrSizeEntryClass {
+	GTypeClass parent_class;
+	void (*finalize) (PublishingTumblrSizeEntry *self);
+};
+
+struct _PublishingTumblrParamSpecSizeEntry {
+	GParamSpec parent_instance;
+};
+
+struct _PublishingTumblrTumblrPublisher {
+	GObject parent_instance;
+	PublishingTumblrTumblrPublisherPrivate * priv;
+};
+
+struct _PublishingTumblrTumblrPublisherClass {
+	GObjectClass parent_class;
+};
+
+struct _PublishingTumblrTumblrPublisherPrivate {
+	SpitPublishingService* service;
+	SpitPublishingPluginHost* host;
+	SpitPublishingProgressCallback progress_reporter;
+	gpointer progress_reporter_target;
+	GDestroyNotify progress_reporter_target_destroy_notify;
+	gboolean running;
+	gboolean was_started;
+	PublishingRESTSupportOAuth1Session* session;
+	PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_options_pane;
+	PublishingTumblrSizeEntry** sizes;
+	gint sizes_length1;
+	gint _sizes_size_;
+	PublishingTumblrBlogEntry** blogs;
+	gint blogs_length1;
+	gint _blogs_size_;
+	gchar* username;
+	SpitPublishingAuthenticator* authenticator;
+};
+
+struct _PublishingTumblrTumblrPublisherPublishingOptionsPane {
+	GObject parent_instance;
+	PublishingTumblrTumblrPublisherPublishingOptionsPanePrivate * priv;
+};
+
+struct _PublishingTumblrTumblrPublisherPublishingOptionsPaneClass {
+	GObjectClass parent_class;
+};
+
+struct _PublishingTumblrTumblrPublisherPublishingOptionsPanePrivate {
+	GtkBuilder* builder;
+	GtkBox* pane_widget;
+	GtkLabel* upload_info_label;
+	GtkLabel* size_label;
+	GtkLabel* blog_label;
+	GtkButton* logout_button;
+	GtkButton* publish_button;
+	GtkComboBoxText* size_combo;
+	GtkComboBoxText* blog_combo;
+	PublishingTumblrSizeEntry** sizes;
+	gint sizes_length1;
+	gint _sizes_size_;
+	PublishingTumblrBlogEntry** blogs;
+	gint blogs_length1;
+	gint _blogs_size_;
+	gchar* username;
+	PublishingTumblrTumblrPublisher* publisher;
+	SpitPublishingPublisherMediaType media_type;
+};
+
+struct _PublishingTumblrTumblrPublisherUserInfoFetchTransaction {
+	PublishingRESTSupportOAuth1Transaction parent_instance;
+	PublishingTumblrTumblrPublisherUserInfoFetchTransactionPrivate * priv;
+};
+
+struct _PublishingTumblrTumblrPublisherUserInfoFetchTransactionClass {
+	PublishingRESTSupportOAuth1TransactionClass parent_class;
+};
+
+struct _PublishingTumblrTumblrPublisherUploadTransaction {
+	PublishingRESTSupportOAuth1UploadTransaction parent_instance;
+	PublishingTumblrTumblrPublisherUploadTransactionPrivate * priv;
+};
+
+struct _PublishingTumblrTumblrPublisherUploadTransactionClass {
+	PublishingRESTSupportOAuth1UploadTransactionClass parent_class;
+};
+
+struct _PublishingTumblrTumblrPublisherUploader {
+	PublishingRESTSupportBatchUploader parent_instance;
+	PublishingTumblrTumblrPublisherUploaderPrivate * priv;
+};
+
+struct _PublishingTumblrTumblrPublisherUploaderClass {
+	PublishingRESTSupportBatchUploaderClass parent_class;
+};
+
+struct _PublishingTumblrTumblrPublisherUploaderPrivate {
+	gchar* blog_url;
+};
+
+
+static gpointer tumblr_service_parent_class = NULL;
+static GdkPixbuf** tumblr_service_icon_pixbuf_set;
+static gint tumblr_service_icon_pixbuf_set_length1;
+static GdkPixbuf** tumblr_service_icon_pixbuf_set = NULL;
+static gint tumblr_service_icon_pixbuf_set_length1 = 0;
+static gint _tumblr_service_icon_pixbuf_set_size_ = 0;
+static SpitPluggableIface * tumblr_service_spit_pluggable_parent_iface = NULL;
+static SpitPublishingServiceIface * tumblr_service_spit_publishing_service_parent_iface = NULL;
+static gpointer publishing_tumblr_blog_entry_parent_class = NULL;
+static gpointer publishing_tumblr_size_entry_parent_class = NULL;
+static gpointer publishing_tumblr_tumblr_publisher_parent_class = NULL;
+static gpointer publishing_tumblr_tumblr_publisher_publishing_options_pane_parent_class = NULL;
+static SpitPublishingDialogPaneIface * publishing_tumblr_tumblr_publisher_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL;
+static gpointer publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_parent_class = NULL;
+static gpointer publishing_tumblr_tumblr_publisher_upload_transaction_parent_class = NULL;
+static gpointer publishing_tumblr_tumblr_publisher_uploader_parent_class = NULL;
+static SpitPublishingPublisherIface * publishing_tumblr_tumblr_publisher_spit_publishing_publisher_parent_iface = NULL;
+
+GType tumblr_service_get_type (void) G_GNUC_CONST;
+#define TUMBLR_SERVICE_ICON_FILENAME "tumblr.png"
+TumblrService* tumblr_service_new (GFile* resource_directory);
+TumblrService* tumblr_service_construct (GType object_type,
+                                         GFile* resource_directory);
+static gint tumblr_service_real_get_pluggable_interface (SpitPluggable* base,
+                                                  gint min_host_interface,
+                                                  gint max_host_interface);
+static const gchar* tumblr_service_real_get_id (SpitPluggable* base);
+static const gchar* tumblr_service_real_get_pluggable_name (SpitPluggable* base);
+static void tumblr_service_real_get_info (SpitPluggable* base,
+                                   SpitPluggableInfo* info);
+static GdkPixbuf** _vala_array_dup8 (GdkPixbuf** self,
+                              int length);
+static void tumblr_service_real_activation (SpitPluggable* base,
+                                     gboolean enabled);
+static SpitPublishingPublisher* tumblr_service_real_create_publisher (SpitPublishingService* base,
+                                                               SpitPublishingPluginHost* host);
+PublishingTumblrTumblrPublisher* publishing_tumblr_tumblr_publisher_new (SpitPublishingService* service,
+                                                                         SpitPublishingPluginHost* host);
+PublishingTumblrTumblrPublisher* publishing_tumblr_tumblr_publisher_construct (GType object_type,
+                                                                               SpitPublishingService* service,
+                                                                               SpitPublishingPluginHost* host);
+GType publishing_tumblr_tumblr_publisher_get_type (void) G_GNUC_CONST;
+static SpitPublishingPublisherMediaType tumblr_service_real_get_supported_media (SpitPublishingService* base);
+static void tumblr_service_finalize (GObject * obj);
+#define PUBLISHING_TUMBLR_SERVICE_NAME "Tumblr"
+#define PUBLISHING_TUMBLR_ENDPOINT_URL "https://www.tumblr.com/"
+#define PUBLISHING_TUMBLR_ENCODE_RFC_3986_EXTRA "!*'();:@&=+$,/?%#[] \\"
+#define PUBLISHING_TUMBLR_ORIGINAL_SIZE -1
+gpointer publishing_tumblr_blog_entry_ref (gpointer instance);
+void publishing_tumblr_blog_entry_unref (gpointer instance);
+GParamSpec* publishing_tumblr_param_spec_blog_entry (const gchar* name,
+                                                     const gchar* nick,
+                                                     const gchar* blurb,
+                                                     GType object_type,
+                                                     GParamFlags flags);
+void publishing_tumblr_value_set_blog_entry (GValue* value,
+                                             gpointer v_object);
+void publishing_tumblr_value_take_blog_entry (GValue* value,
+                                              gpointer v_object);
+gpointer publishing_tumblr_value_get_blog_entry (const GValue* value);
+GType publishing_tumblr_blog_entry_get_type (void) G_GNUC_CONST;
+PublishingTumblrBlogEntry* publishing_tumblr_blog_entry_new (const gchar* creator_blog,
+                                                             const gchar* creator_url);
+PublishingTumblrBlogEntry* publishing_tumblr_blog_entry_construct (GType object_type,
+                                                                   const gchar* creator_blog,
+                                                                   const gchar* creator_url);
+static void publishing_tumblr_blog_entry_finalize (PublishingTumblrBlogEntry * obj);
+gpointer publishing_tumblr_size_entry_ref (gpointer instance);
+void publishing_tumblr_size_entry_unref (gpointer instance);
+GParamSpec* publishing_tumblr_param_spec_size_entry (const gchar* name,
+                                                     const gchar* nick,
+                                                     const gchar* blurb,
+                                                     GType object_type,
+                                                     GParamFlags flags);
+void publishing_tumblr_value_set_size_entry (GValue* value,
+                                             gpointer v_object);
+void publishing_tumblr_value_take_size_entry (GValue* value,
+                                              gpointer v_object);
+gpointer publishing_tumblr_value_get_size_entry (const GValue* value);
+GType publishing_tumblr_size_entry_get_type (void) G_GNUC_CONST;
+PublishingTumblrSizeEntry* publishing_tumblr_size_entry_new (const gchar* creator_title,
+                                                             gint creator_size);
+PublishingTumblrSizeEntry* publishing_tumblr_size_entry_construct (GType object_type,
+                                                                   const gchar* creator_title,
+                                                                   gint creator_size);
+static void publishing_tumblr_size_entry_finalize (PublishingTumblrSizeEntry * obj);
+GType publishing_tumblr_tumblr_publisher_publishing_options_pane_get_type (void) G_GNUC_CONST;
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisherPrivate))
+static void publishing_tumblr_tumblr_publisher_on_authenticator_authenticated (PublishingTumblrTumblrPublisher* self);
+static void _publishing_tumblr_tumblr_publisher_on_authenticator_authenticated_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender,
+                                                                                                                     gpointer self);
+static PublishingTumblrSizeEntry** publishing_tumblr_tumblr_publisher_create_sizes (PublishingTumblrTumblrPublisher* self,
+                                                                             int* result_length1);
+static void _vala_array_add31 (PublishingTumblrSizeEntry** * array,
+                        int* length,
+                        int* size,
+                        PublishingTumblrSizeEntry* value);
+static void _vala_array_add32 (PublishingTumblrSizeEntry** * array,
+                        int* length,
+                        int* size,
+                        PublishingTumblrSizeEntry* value);
+static void _vala_array_add33 (PublishingTumblrSizeEntry** * array,
+                        int* length,
+                        int* size,
+                        PublishingTumblrSizeEntry* value);
+static PublishingTumblrBlogEntry** publishing_tumblr_tumblr_publisher_create_blogs (PublishingTumblrTumblrPublisher* self,
+                                                                             int* result_length1);
+static SpitPublishingService* publishing_tumblr_tumblr_publisher_real_get_service (SpitPublishingPublisher* base);
+SpitPublishingPluginHost* publishing_tumblr_tumblr_publisher_get_host (PublishingTumblrTumblrPublisher* self);
+static gboolean publishing_tumblr_tumblr_publisher_real_is_running (SpitPublishingPublisher* base);
+gint publishing_tumblr_tumblr_publisher_get_persistent_default_size (PublishingTumblrTumblrPublisher* self);
+void publishing_tumblr_tumblr_publisher_set_persistent_default_size (PublishingTumblrTumblrPublisher* self,
+                                                                     gint size);
+gint publishing_tumblr_tumblr_publisher_get_persistent_default_blog (PublishingTumblrTumblrPublisher* self);
+void publishing_tumblr_tumblr_publisher_set_persistent_default_blog (PublishingTumblrTumblrPublisher* self,
+                                                                     gint blog);
+static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTumblrPublisher* self);
+GType publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_get_type (void) G_GNUC_CONST;
+PublishingTumblrTumblrPublisherUserInfoFetchTransaction* publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_new (PublishingRESTSupportOAuth1Session* session);
+PublishingTumblrTumblrPublisherUserInfoFetchTransaction* publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_construct (GType object_type,
+                                                                                                                                   PublishingRESTSupportOAuth1Session* session);
+static void publishing_tumblr_tumblr_publisher_on_info_request_txn_completed (PublishingTumblrTumblrPublisher* self,
+                                                                       PublishingRESTSupportTransaction* txn);
+static void _publishing_tumblr_tumblr_publisher_on_info_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                                      gpointer self);
+static void publishing_tumblr_tumblr_publisher_on_info_request_txn_error (PublishingTumblrTumblrPublisher* self,
+                                                                   PublishingRESTSupportTransaction* txn,
+                                                                   GError* err);
+static void _publishing_tumblr_tumblr_publisher_on_info_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                                      GError* err,
+                                                                                                                      gpointer self);
+static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_request (PublishingTumblrTumblrPublisher* self,
+                                                                               const gchar* response);
+static void publishing_tumblr_tumblr_publisher_do_show_publishing_options_pane (PublishingTumblrTumblrPublisher* self);
+static void _vala_array_add34 (PublishingTumblrBlogEntry** * array,
+                        int* length,
+                        int* size,
+                        PublishingTumblrBlogEntry* value);
+PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_publisher_publishing_options_pane_new (PublishingTumblrTumblrPublisher* publisher,
+                                                                                                                      SpitPublishingPublisherMediaType media_type,
+                                                                                                                      PublishingTumblrSizeEntry** sizes,
+                                                                                                                      int sizes_length1,
+                                                                                                                      PublishingTumblrBlogEntry** blogs,
+                                                                                                                      int blogs_length1,
+                                                                                                                      const gchar* username);
+PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_publisher_publishing_options_pane_construct (GType object_type,
+                                                                                                                            PublishingTumblrTumblrPublisher* publisher,
+                                                                                                                            SpitPublishingPublisherMediaType media_type,
+                                                                                                                            PublishingTumblrSizeEntry** sizes,
+                                                                                                                            int sizes_length1,
+                                                                                                                            PublishingTumblrBlogEntry** blogs,
+                                                                                                                            int blogs_length1,
+                                                                                                                            const gchar* username);
+static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish (PublishingTumblrTumblrPublisher* self);
+static void _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender,
+                                                                                                                                                gpointer self);
+static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout (PublishingTumblrTumblrPublisher* self);
+static void _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender,
+                                                                                                                                              gpointer self);
+static void publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumblrPublisher* self);
+static void publishing_tumblr_tumblr_publisher_do_logout (PublishingTumblrTumblrPublisher* self);
+gint publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func (SpitPublishingPublishable* a,
+                                                                       SpitPublishingPublishable* b);
+static gint _publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func_gcompare_data_func (gconstpointer a,
+                                                                                           gconstpointer b,
+                                                                                           gpointer self);
+GType publishing_tumblr_tumblr_publisher_uploader_get_type (void) G_GNUC_CONST;
+PublishingTumblrTumblrPublisherUploader* publishing_tumblr_tumblr_publisher_uploader_new (PublishingRESTSupportOAuth1Session* session,
+                                                                                          SpitPublishingPublishable** publishables,
+                                                                                          int publishables_length1,
+                                                                                          const gchar* blog_url);
+PublishingTumblrTumblrPublisherUploader* publishing_tumblr_tumblr_publisher_uploader_construct (GType object_type,
+                                                                                                PublishingRESTSupportOAuth1Session* session,
+                                                                                                SpitPublishingPublishable** publishables,
+                                                                                                int publishables_length1,
+                                                                                                const gchar* blog_url);
+static void publishing_tumblr_tumblr_publisher_on_upload_complete (PublishingTumblrTumblrPublisher* self,
+                                                            PublishingRESTSupportBatchUploader* uploader,
+                                                            gint num_published);
+static void _publishing_tumblr_tumblr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender,
+                                                                                                                    gint num_photos_published,
+                                                                                                                    gpointer self);
+static void publishing_tumblr_tumblr_publisher_on_upload_error (PublishingTumblrTumblrPublisher* self,
+                                                         PublishingRESTSupportBatchUploader* uploader,
+                                                         GError* err);
+static void _publishing_tumblr_tumblr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender,
+                                                                                                              GError* err,
+                                                                                                              gpointer self);
+static void publishing_tumblr_tumblr_publisher_on_upload_status_updated (PublishingTumblrTumblrPublisher* self,
+                                                                  gint file_number,
+                                                                  gdouble completed_fraction);
+static void _publishing_tumblr_tumblr_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number,
+                                                                                                     gdouble fraction_complete,
+                                                                                                     gpointer self);
+static void publishing_tumblr_tumblr_publisher_do_show_success_pane (PublishingTumblrTumblrPublisher* self);
+void publishing_tumblr_tumblr_publisher_attempt_start (PublishingTumblrTumblrPublisher* self);
+static void publishing_tumblr_tumblr_publisher_real_start (SpitPublishingPublisher* base);
+static void publishing_tumblr_tumblr_publisher_real_stop (SpitPublishingPublisher* base);
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPanePrivate))
+static PublishingTumblrSizeEntry** _vala_array_dup9 (PublishingTumblrSizeEntry** self,
+                                              int length);
+static PublishingTumblrBlogEntry** _vala_array_dup10 (PublishingTumblrBlogEntry** self,
+                                               int length);
+static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_blog_combo (PublishingTumblrTumblrPublisherPublishingOptionsPane* self);
+static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed (PublishingTumblrTumblrPublisherPublishingOptionsPane* self);
+static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+                                                                                                        gpointer self);
+static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_size_combo (PublishingTumblrTumblrPublisherPublishingOptionsPane* self);
+static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed (PublishingTumblrTumblrPublisherPublishingOptionsPane* self);
+static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+                                                                                                        gpointer self);
+static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked (PublishingTumblrTumblrPublisherPublishingOptionsPane* self);
+static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                                       gpointer self);
+static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked (PublishingTumblrTumblrPublisherPublishingOptionsPane* self);
+static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                                        gpointer self);
+void publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* self);
+void publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* self);
+static GtkWidget* publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base);
+static SpitPublishingDialogPaneGeometryOptions publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
+static void publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
+static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender,
+                                                                                                                                                    gpointer self);
+static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender,
+                                                                                                                                                  gpointer self);
+static void publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
+static void publishing_tumblr_tumblr_publisher_publishing_options_pane_finalize (GObject * obj);
+GType publishing_tumblr_tumblr_publisher_upload_transaction_get_type (void) G_GNUC_CONST;
+static gchar* publishing_tumblr_tumblr_publisher_upload_transaction_encode (PublishingTumblrTumblrPublisherUploadTransaction* self,
+                                                                     guint8* data,
+                                                                     int data_length1);
+PublishingTumblrTumblrPublisherUploadTransaction* publishing_tumblr_tumblr_publisher_upload_transaction_new (PublishingRESTSupportOAuth1Session* session,
+                                                                                                             SpitPublishingPublishable* publishable,
+                                                                                                             const gchar* blog_url);
+PublishingTumblrTumblrPublisherUploadTransaction* publishing_tumblr_tumblr_publisher_upload_transaction_construct (GType object_type,
+                                                                                                                   PublishingRESTSupportOAuth1Session* session,
+                                                                                                                   SpitPublishingPublishable* publishable,
+                                                                                                                   const gchar* blog_url);
+static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (PublishingRESTSupportTransaction* base,
+                                                                         GError** error);
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, PublishingTumblrTumblrPublisherUploaderPrivate))
+static PublishingRESTSupportTransaction* publishing_tumblr_tumblr_publisher_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base,
+                                                                                                       SpitPublishingPublishable* publishable);
+static void publishing_tumblr_tumblr_publisher_uploader_finalize (PublishingRESTSupportBatchUploader * obj);
+static void publishing_tumblr_tumblr_publisher_finalize (GObject * obj);
+static void _vala_array_destroy (gpointer array,
+                          gint array_length,
+                          GDestroyNotify destroy_func);
+static void _vala_array_free (gpointer array,
+                       gint array_length,
+                       GDestroyNotify destroy_func);
+
+
+TumblrService*
+tumblr_service_construct (GType object_type,
+                          GFile* resource_directory)
+{
+	TumblrService * self = NULL;
+	GdkPixbuf** _tmp0_;
+	gint _tmp0__length1;
+#line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
+#line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = (TumblrService*) g_object_new (object_type, NULL);
+#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = tumblr_service_icon_pixbuf_set;
+#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0__length1 = tumblr_service_icon_pixbuf_set_length1;
+#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (_tmp0_ == NULL) {
+#line 568 "TumblrPublishing.c"
+		gint _tmp1_;
+		GdkPixbuf** _tmp2_;
+#line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp2_ = resources_load_from_resource (PLUGIN_RESOURCE_PATH "/" TUMBLR_SERVICE_ICON_FILENAME, &_tmp1_);
+#line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		tumblr_service_icon_pixbuf_set = (_vala_array_free (tumblr_service_icon_pixbuf_set, tumblr_service_icon_pixbuf_set_length1, (GDestroyNotify) g_object_unref), NULL);
+#line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		tumblr_service_icon_pixbuf_set = _tmp2_;
+#line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		tumblr_service_icon_pixbuf_set_length1 = _tmp1_;
+#line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tumblr_service_icon_pixbuf_set_size_ = tumblr_service_icon_pixbuf_set_length1;
+#line 581 "TumblrPublishing.c"
+	}
+#line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return self;
+#line 585 "TumblrPublishing.c"
+}
+
+
+TumblrService*
+tumblr_service_new (GFile* resource_directory)
+{
+#line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return tumblr_service_construct (TYPE_TUMBLR_SERVICE, resource_directory);
+#line 594 "TumblrPublishing.c"
+}
+
+
+static gint
+tumblr_service_real_get_pluggable_interface (SpitPluggable* base,
+                                             gint min_host_interface,
+                                             gint max_host_interface)
+{
+	TumblrService * self;
+	gint result = 0;
+#line 20 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TUMBLR_SERVICE, TumblrService);
+#line 21 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	result = spit_negotiate_interfaces (min_host_interface, max_host_interface, SPIT_PUBLISHING_CURRENT_INTERFACE);
+#line 21 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 611 "TumblrPublishing.c"
+}
+
+
+static const gchar*
+tumblr_service_real_get_id (SpitPluggable* base)
+{
+	TumblrService * self;
+	const gchar* result = NULL;
+#line 25 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TUMBLR_SERVICE, TumblrService);
+#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	result = "org.yorba.shotwell.publishing.tumblr";
+#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 626 "TumblrPublishing.c"
+}
+
+
+static const gchar*
+tumblr_service_real_get_pluggable_name (SpitPluggable* base)
+{
+	TumblrService * self;
+	const gchar* result = NULL;
+#line 29 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TUMBLR_SERVICE, TumblrService);
+#line 30 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	result = "Tumblr";
+#line 30 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 641 "TumblrPublishing.c"
+}
+
+
+static gpointer
+_g_object_ref0 (gpointer self)
+{
+#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return self ? g_object_ref (self) : NULL;
+#line 650 "TumblrPublishing.c"
+}
+
+
+static GdkPixbuf**
+_vala_array_dup8 (GdkPixbuf** self,
+                  int length)
+{
+	GdkPixbuf** result;
+	int i;
+#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	result = g_new0 (GdkPixbuf*, length + 1);
+#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	for (i = 0; i < length; i++) {
+#line 664 "TumblrPublishing.c"
+		GdkPixbuf* _tmp0_;
+#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp0_ = _g_object_ref0 (self[i]);
+#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		result[i] = _tmp0_;
+#line 670 "TumblrPublishing.c"
+	}
+#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 674 "TumblrPublishing.c"
+}
+
+
+static void
+tumblr_service_real_get_info (SpitPluggable* base,
+                              SpitPluggableInfo* info)
+{
+	TumblrService * self;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	GdkPixbuf** _tmp7_;
+	gint _tmp7__length1;
+	GdkPixbuf** _tmp8_;
+	gint _tmp8__length1;
+#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TUMBLR_SERVICE, TumblrService);
+#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (info != NULL);
+#line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = g_strdup ("Jeroen Arnoldus");
+#line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 ((*info).authors);
+#line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(*info).authors = _tmp0_;
+#line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = g_strdup (_ ("Copyright 2012 BJA Electronics"));
+#line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 ((*info).copyright);
+#line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(*info).copyright = _tmp1_;
+#line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2_ = g_strdup (RESOURCES_TRANSLATORS);
+#line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 ((*info).translators);
+#line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(*info).translators = _tmp2_;
+#line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp3_ = g_strdup (_VERSION);
+#line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 ((*info).version);
+#line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(*info).version = _tmp3_;
+#line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp4_ = g_strdup (RESOURCES_WEBSITE_NAME);
+#line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 ((*info).website_name);
+#line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(*info).website_name = _tmp4_;
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp5_ = g_strdup (RESOURCES_WEBSITE_URL);
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 ((*info).website_url);
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(*info).website_url = _tmp5_;
+#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(*info).is_license_wordwrapped = FALSE;
+#line 41 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp6_ = g_strdup (RESOURCES_LICENSE);
+#line 41 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 ((*info).license);
+#line 41 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(*info).license = _tmp6_;
+#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp7_ = tumblr_service_icon_pixbuf_set;
+#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp7__length1 = tumblr_service_icon_pixbuf_set_length1;
+#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup8 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_);
+#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp8__length1 = _tmp7__length1;
+#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(*info).icons = (_vala_array_free ((*info).icons, (*info).icons_length1, (GDestroyNotify) g_object_unref), NULL);
+#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(*info).icons = _tmp8_;
+#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(*info).icons_length1 = _tmp8__length1;
+#line 756 "TumblrPublishing.c"
+}
+
+
+static void
+tumblr_service_real_activation (SpitPluggable* base,
+                                gboolean enabled)
+{
+	TumblrService * self;
+#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TUMBLR_SERVICE, TumblrService);
+#line 767 "TumblrPublishing.c"
+}
+
+
+static SpitPublishingPublisher*
+tumblr_service_real_create_publisher (SpitPublishingService* base,
+                                      SpitPublishingPluginHost* host)
+{
+	TumblrService * self;
+	SpitPublishingPublisher* result = NULL;
+	PublishingTumblrTumblrPublisher* _tmp0_;
+#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TUMBLR_SERVICE, TumblrService);
+#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
+#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = publishing_tumblr_tumblr_publisher_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService), host);
+#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
+#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 788 "TumblrPublishing.c"
+}
+
+
+static SpitPublishingPublisherMediaType
+tumblr_service_real_get_supported_media (SpitPublishingService* base)
+{
+	TumblrService * self;
+	SpitPublishingPublisherMediaType result = 0;
+#line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TUMBLR_SERVICE, TumblrService);
+#line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO;
+#line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 803 "TumblrPublishing.c"
+}
+
+
+static void
+tumblr_service_class_init (TumblrServiceClass * klass)
+{
+#line 8 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	tumblr_service_parent_class = g_type_class_peek_parent (klass);
+#line 8 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	G_OBJECT_CLASS (klass)->finalize = tumblr_service_finalize;
+#line 814 "TumblrPublishing.c"
+}
+
+
+static void
+tumblr_service_spit_pluggable_interface_init (SpitPluggableIface * iface)
+{
+#line 8 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	tumblr_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface);
+#line 8 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	iface->get_pluggable_interface = (gint (*) (SpitPluggable *, gint, gint)) tumblr_service_real_get_pluggable_interface;
+#line 8 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	iface->get_id = (const gchar* (*) (SpitPluggable *)) tumblr_service_real_get_id;
+#line 8 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	iface->get_pluggable_name = (const gchar* (*) (SpitPluggable *)) tumblr_service_real_get_pluggable_name;
+#line 8 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) tumblr_service_real_get_info;
+#line 8 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	iface->activation = (void (*) (SpitPluggable *, gboolean)) tumblr_service_real_activation;
+#line 833 "TumblrPublishing.c"
+}
+
+
+static void
+tumblr_service_spit_publishing_service_interface_init (SpitPublishingServiceIface * iface)
+{
+#line 8 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	tumblr_service_spit_publishing_service_parent_iface = g_type_interface_peek_parent (iface);
+#line 8 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	iface->create_publisher = (SpitPublishingPublisher* (*) (SpitPublishingService *, SpitPublishingPluginHost*)) tumblr_service_real_create_publisher;
+#line 8 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) tumblr_service_real_get_supported_media;
+#line 846 "TumblrPublishing.c"
+}
+
+
+static void
+tumblr_service_instance_init (TumblrService * self)
+{
+}
+
+
+static void
+tumblr_service_finalize (GObject * obj)
+{
+	TumblrService * self;
+#line 8 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TUMBLR_SERVICE, TumblrService);
+#line 8 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	G_OBJECT_CLASS (tumblr_service_parent_class)->finalize (obj);
+#line 864 "TumblrPublishing.c"
+}
+
+
+GType
+tumblr_service_get_type (void)
+{
+	static volatile gsize tumblr_service_type_id__volatile = 0;
+	if (g_once_init_enter (&tumblr_service_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (TumblrServiceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) tumblr_service_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TumblrService), 0, (GInstanceInitFunc) tumblr_service_instance_init, NULL };
+		static const GInterfaceInfo spit_pluggable_info = { (GInterfaceInitFunc) tumblr_service_spit_pluggable_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
+		static const GInterfaceInfo spit_publishing_service_info = { (GInterfaceInitFunc) tumblr_service_spit_publishing_service_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
+		GType tumblr_service_type_id;
+		tumblr_service_type_id = g_type_register_static (G_TYPE_OBJECT, "TumblrService", &g_define_type_info, 0);
+		g_type_add_interface_static (tumblr_service_type_id, SPIT_TYPE_PLUGGABLE, &spit_pluggable_info);
+		g_type_add_interface_static (tumblr_service_type_id, SPIT_PUBLISHING_TYPE_SERVICE, &spit_publishing_service_info);
+		g_once_init_leave (&tumblr_service_type_id__volatile, tumblr_service_type_id);
+	}
+	return tumblr_service_type_id__volatile;
+}
+
+
+PublishingTumblrBlogEntry*
+publishing_tumblr_blog_entry_construct (GType object_type,
+                                        const gchar* creator_blog,
+                                        const gchar* creator_url)
+{
+	PublishingTumblrBlogEntry* self = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (creator_blog != NULL, NULL);
+#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (creator_url != NULL, NULL);
+#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = (PublishingTumblrBlogEntry*) g_type_create_instance (object_type);
+#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = g_strdup (creator_blog);
+#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 (self->blog);
+#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->blog = _tmp0_;
+#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = g_strdup (creator_url);
+#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 (self->url);
+#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->url = _tmp1_;
+#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return self;
+#line 914 "TumblrPublishing.c"
+}
+
+
+PublishingTumblrBlogEntry*
+publishing_tumblr_blog_entry_new (const gchar* creator_blog,
+                                  const gchar* creator_url)
+{
+#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return publishing_tumblr_blog_entry_construct (PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY, creator_blog, creator_url);
+#line 924 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_value_blog_entry_init (GValue* value)
+{
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	value->data[0].v_pointer = NULL;
+#line 933 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_value_blog_entry_free_value (GValue* value)
+{
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (value->data[0].v_pointer) {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		publishing_tumblr_blog_entry_unref (value->data[0].v_pointer);
+#line 944 "TumblrPublishing.c"
+	}
+}
+
+
+static void
+publishing_tumblr_value_blog_entry_copy_value (const GValue* src_value,
+                                               GValue* dest_value)
+{
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (src_value->data[0].v_pointer) {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		dest_value->data[0].v_pointer = publishing_tumblr_blog_entry_ref (src_value->data[0].v_pointer);
+#line 957 "TumblrPublishing.c"
+	} else {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		dest_value->data[0].v_pointer = NULL;
+#line 961 "TumblrPublishing.c"
+	}
+}
+
+
+static gpointer
+publishing_tumblr_value_blog_entry_peek_pointer (const GValue* value)
+{
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return value->data[0].v_pointer;
+#line 971 "TumblrPublishing.c"
+}
+
+
+static gchar*
+publishing_tumblr_value_blog_entry_collect_value (GValue* value,
+                                                  guint n_collect_values,
+                                                  GTypeCValue* collect_values,
+                                                  guint collect_flags)
+{
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (collect_values[0].v_pointer) {
+#line 983 "TumblrPublishing.c"
+		PublishingTumblrBlogEntry * object;
+		object = collect_values[0].v_pointer;
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		if (object->parent_instance.g_class == NULL) {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 990 "TumblrPublishing.c"
+		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.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 994 "TumblrPublishing.c"
+		}
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		value->data[0].v_pointer = publishing_tumblr_blog_entry_ref (object);
+#line 998 "TumblrPublishing.c"
+	} else {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		value->data[0].v_pointer = NULL;
+#line 1002 "TumblrPublishing.c"
+	}
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return NULL;
+#line 1006 "TumblrPublishing.c"
+}
+
+
+static gchar*
+publishing_tumblr_value_blog_entry_lcopy_value (const GValue* value,
+                                                guint n_collect_values,
+                                                GTypeCValue* collect_values,
+                                                guint collect_flags)
+{
+	PublishingTumblrBlogEntry ** object_p;
+	object_p = collect_values[0].v_pointer;
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (!object_p) {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
+#line 1022 "TumblrPublishing.c"
+	}
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (!value->data[0].v_pointer) {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		*object_p = NULL;
+#line 1028 "TumblrPublishing.c"
+	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		*object_p = value->data[0].v_pointer;
+#line 1032 "TumblrPublishing.c"
+	} else {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		*object_p = publishing_tumblr_blog_entry_ref (value->data[0].v_pointer);
+#line 1036 "TumblrPublishing.c"
+	}
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return NULL;
+#line 1040 "TumblrPublishing.c"
+}
+
+
+GParamSpec*
+publishing_tumblr_param_spec_blog_entry (const gchar* name,
+                                         const gchar* nick,
+                                         const gchar* blurb,
+                                         GType object_type,
+                                         GParamFlags flags)
+{
+	PublishingTumblrParamSpecBlogEntry* spec;
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY), NULL);
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	G_PARAM_SPEC (spec)->value_type = object_type;
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return G_PARAM_SPEC (spec);
+#line 1060 "TumblrPublishing.c"
+}
+
+
+gpointer
+publishing_tumblr_value_get_blog_entry (const GValue* value)
+{
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY), NULL);
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return value->data[0].v_pointer;
+#line 1071 "TumblrPublishing.c"
+}
+
+
+void
+publishing_tumblr_value_set_blog_entry (GValue* value,
+                                        gpointer v_object)
+{
+	PublishingTumblrBlogEntry * old;
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY));
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	old = value->data[0].v_pointer;
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (v_object) {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY));
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		value->data[0].v_pointer = v_object;
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		publishing_tumblr_blog_entry_ref (value->data[0].v_pointer);
+#line 1094 "TumblrPublishing.c"
+	} else {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		value->data[0].v_pointer = NULL;
+#line 1098 "TumblrPublishing.c"
+	}
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (old) {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		publishing_tumblr_blog_entry_unref (old);
+#line 1104 "TumblrPublishing.c"
+	}
+}
+
+
+void
+publishing_tumblr_value_take_blog_entry (GValue* value,
+                                         gpointer v_object)
+{
+	PublishingTumblrBlogEntry * old;
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY));
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	old = value->data[0].v_pointer;
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (v_object) {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY));
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		value->data[0].v_pointer = v_object;
+#line 1126 "TumblrPublishing.c"
+	} else {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		value->data[0].v_pointer = NULL;
+#line 1130 "TumblrPublishing.c"
+	}
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (old) {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		publishing_tumblr_blog_entry_unref (old);
+#line 1136 "TumblrPublishing.c"
+	}
+}
+
+
+static void
+publishing_tumblr_blog_entry_class_init (PublishingTumblrBlogEntryClass * klass)
+{
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_blog_entry_parent_class = g_type_class_peek_parent (klass);
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	((PublishingTumblrBlogEntryClass *) klass)->finalize = publishing_tumblr_blog_entry_finalize;
+#line 1148 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_blog_entry_instance_init (PublishingTumblrBlogEntry * self)
+{
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->ref_count = 1;
+#line 1157 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_blog_entry_finalize (PublishingTumblrBlogEntry * obj)
+{
+	PublishingTumblrBlogEntry * self;
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY, PublishingTumblrBlogEntry);
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_handlers_destroy (self);
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 (self->blog);
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 (self->url);
+#line 1173 "TumblrPublishing.c"
+}
+
+
+GType
+publishing_tumblr_blog_entry_get_type (void)
+{
+	static volatile gsize publishing_tumblr_blog_entry_type_id__volatile = 0;
+	if (g_once_init_enter (&publishing_tumblr_blog_entry_type_id__volatile)) {
+		static const GTypeValueTable g_define_type_value_table = { publishing_tumblr_value_blog_entry_init, publishing_tumblr_value_blog_entry_free_value, publishing_tumblr_value_blog_entry_copy_value, publishing_tumblr_value_blog_entry_peek_pointer, "p", publishing_tumblr_value_blog_entry_collect_value, "p", publishing_tumblr_value_blog_entry_lcopy_value };
+		static const GTypeInfo g_define_type_info = { sizeof (PublishingTumblrBlogEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_tumblr_blog_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingTumblrBlogEntry), 0, (GInstanceInitFunc) publishing_tumblr_blog_entry_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_tumblr_blog_entry_type_id;
+		publishing_tumblr_blog_entry_type_id = g_type_register_fundamental (g_type_fundamental_next (), "PublishingTumblrBlogEntry", &g_define_type_info, &g_define_type_fundamental_info, 0);
+		g_once_init_leave (&publishing_tumblr_blog_entry_type_id__volatile, publishing_tumblr_blog_entry_type_id);
+	}
+	return publishing_tumblr_blog_entry_type_id__volatile;
+}
+
+
+gpointer
+publishing_tumblr_blog_entry_ref (gpointer instance)
+{
+	PublishingTumblrBlogEntry * self;
+	self = instance;
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_atomic_int_inc (&self->ref_count);
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return instance;
+#line 1202 "TumblrPublishing.c"
+}
+
+
+void
+publishing_tumblr_blog_entry_unref (gpointer instance)
+{
+	PublishingTumblrBlogEntry * self;
+	self = instance;
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (g_atomic_int_dec_and_test (&self->ref_count)) {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		PUBLISHING_TUMBLR_BLOG_ENTRY_GET_CLASS (self)->finalize (self);
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_type_free_instance ((GTypeInstance *) self);
+#line 1217 "TumblrPublishing.c"
+	}
+}
+
+
+PublishingTumblrSizeEntry*
+publishing_tumblr_size_entry_construct (GType object_type,
+                                        const gchar* creator_title,
+                                        gint creator_size)
+{
+	PublishingTumblrSizeEntry* self = NULL;
+	gchar* _tmp0_;
+#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (creator_title != NULL, NULL);
+#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = (PublishingTumblrSizeEntry*) g_type_create_instance (object_type);
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = g_strdup (creator_title);
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 (self->title);
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->title = _tmp0_;
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->size = creator_size;
+#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return self;
+#line 1243 "TumblrPublishing.c"
+}
+
+
+PublishingTumblrSizeEntry*
+publishing_tumblr_size_entry_new (const gchar* creator_title,
+                                  gint creator_size)
+{
+#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return publishing_tumblr_size_entry_construct (PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY, creator_title, creator_size);
+#line 1253 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_value_size_entry_init (GValue* value)
+{
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	value->data[0].v_pointer = NULL;
+#line 1262 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_value_size_entry_free_value (GValue* value)
+{
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (value->data[0].v_pointer) {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		publishing_tumblr_size_entry_unref (value->data[0].v_pointer);
+#line 1273 "TumblrPublishing.c"
+	}
+}
+
+
+static void
+publishing_tumblr_value_size_entry_copy_value (const GValue* src_value,
+                                               GValue* dest_value)
+{
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (src_value->data[0].v_pointer) {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		dest_value->data[0].v_pointer = publishing_tumblr_size_entry_ref (src_value->data[0].v_pointer);
+#line 1286 "TumblrPublishing.c"
+	} else {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		dest_value->data[0].v_pointer = NULL;
+#line 1290 "TumblrPublishing.c"
+	}
+}
+
+
+static gpointer
+publishing_tumblr_value_size_entry_peek_pointer (const GValue* value)
+{
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return value->data[0].v_pointer;
+#line 1300 "TumblrPublishing.c"
+}
+
+
+static gchar*
+publishing_tumblr_value_size_entry_collect_value (GValue* value,
+                                                  guint n_collect_values,
+                                                  GTypeCValue* collect_values,
+                                                  guint collect_flags)
+{
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (collect_values[0].v_pointer) {
+#line 1312 "TumblrPublishing.c"
+		PublishingTumblrSizeEntry * object;
+		object = collect_values[0].v_pointer;
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		if (object->parent_instance.g_class == NULL) {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 1319 "TumblrPublishing.c"
+		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.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 1323 "TumblrPublishing.c"
+		}
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		value->data[0].v_pointer = publishing_tumblr_size_entry_ref (object);
+#line 1327 "TumblrPublishing.c"
+	} else {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		value->data[0].v_pointer = NULL;
+#line 1331 "TumblrPublishing.c"
+	}
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return NULL;
+#line 1335 "TumblrPublishing.c"
+}
+
+
+static gchar*
+publishing_tumblr_value_size_entry_lcopy_value (const GValue* value,
+                                                guint n_collect_values,
+                                                GTypeCValue* collect_values,
+                                                guint collect_flags)
+{
+	PublishingTumblrSizeEntry ** object_p;
+	object_p = collect_values[0].v_pointer;
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (!object_p) {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
+#line 1351 "TumblrPublishing.c"
+	}
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (!value->data[0].v_pointer) {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		*object_p = NULL;
+#line 1357 "TumblrPublishing.c"
+	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		*object_p = value->data[0].v_pointer;
+#line 1361 "TumblrPublishing.c"
+	} else {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		*object_p = publishing_tumblr_size_entry_ref (value->data[0].v_pointer);
+#line 1365 "TumblrPublishing.c"
+	}
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return NULL;
+#line 1369 "TumblrPublishing.c"
+}
+
+
+GParamSpec*
+publishing_tumblr_param_spec_size_entry (const gchar* name,
+                                         const gchar* nick,
+                                         const gchar* blurb,
+                                         GType object_type,
+                                         GParamFlags flags)
+{
+	PublishingTumblrParamSpecSizeEntry* spec;
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY), NULL);
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	G_PARAM_SPEC (spec)->value_type = object_type;
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return G_PARAM_SPEC (spec);
+#line 1389 "TumblrPublishing.c"
+}
+
+
+gpointer
+publishing_tumblr_value_get_size_entry (const GValue* value)
+{
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY), NULL);
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return value->data[0].v_pointer;
+#line 1400 "TumblrPublishing.c"
+}
+
+
+void
+publishing_tumblr_value_set_size_entry (GValue* value,
+                                        gpointer v_object)
+{
+	PublishingTumblrSizeEntry * old;
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY));
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	old = value->data[0].v_pointer;
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (v_object) {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY));
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		value->data[0].v_pointer = v_object;
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		publishing_tumblr_size_entry_ref (value->data[0].v_pointer);
+#line 1423 "TumblrPublishing.c"
+	} else {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		value->data[0].v_pointer = NULL;
+#line 1427 "TumblrPublishing.c"
+	}
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (old) {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		publishing_tumblr_size_entry_unref (old);
+#line 1433 "TumblrPublishing.c"
+	}
+}
+
+
+void
+publishing_tumblr_value_take_size_entry (GValue* value,
+                                         gpointer v_object)
+{
+	PublishingTumblrSizeEntry * old;
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY));
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	old = value->data[0].v_pointer;
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (v_object) {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY));
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		value->data[0].v_pointer = v_object;
+#line 1455 "TumblrPublishing.c"
+	} else {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		value->data[0].v_pointer = NULL;
+#line 1459 "TumblrPublishing.c"
+	}
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (old) {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		publishing_tumblr_size_entry_unref (old);
+#line 1465 "TumblrPublishing.c"
+	}
+}
+
+
+static void
+publishing_tumblr_size_entry_class_init (PublishingTumblrSizeEntryClass * klass)
+{
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_size_entry_parent_class = g_type_class_peek_parent (klass);
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	((PublishingTumblrSizeEntryClass *) klass)->finalize = publishing_tumblr_size_entry_finalize;
+#line 1477 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_size_entry_instance_init (PublishingTumblrSizeEntry * self)
+{
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->ref_count = 1;
+#line 1486 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_size_entry_finalize (PublishingTumblrSizeEntry * obj)
+{
+	PublishingTumblrSizeEntry * self;
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY, PublishingTumblrSizeEntry);
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_handlers_destroy (self);
+#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 (self->title);
+#line 1500 "TumblrPublishing.c"
+}
+
+
+GType
+publishing_tumblr_size_entry_get_type (void)
+{
+	static volatile gsize publishing_tumblr_size_entry_type_id__volatile = 0;
+	if (g_once_init_enter (&publishing_tumblr_size_entry_type_id__volatile)) {
+		static const GTypeValueTable g_define_type_value_table = { publishing_tumblr_value_size_entry_init, publishing_tumblr_value_size_entry_free_value, publishing_tumblr_value_size_entry_copy_value, publishing_tumblr_value_size_entry_peek_pointer, "p", publishing_tumblr_value_size_entry_collect_value, "p", publishing_tumblr_value_size_entry_lcopy_value };
+		static const GTypeInfo g_define_type_info = { sizeof (PublishingTumblrSizeEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_tumblr_size_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingTumblrSizeEntry), 0, (GInstanceInitFunc) publishing_tumblr_size_entry_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_tumblr_size_entry_type_id;
+		publishing_tumblr_size_entry_type_id = g_type_register_fundamental (g_type_fundamental_next (), "PublishingTumblrSizeEntry", &g_define_type_info, &g_define_type_fundamental_info, 0);
+		g_once_init_leave (&publishing_tumblr_size_entry_type_id__volatile, publishing_tumblr_size_entry_type_id);
+	}
+	return publishing_tumblr_size_entry_type_id__volatile;
+}
+
+
+gpointer
+publishing_tumblr_size_entry_ref (gpointer instance)
+{
+	PublishingTumblrSizeEntry * self;
+	self = instance;
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_atomic_int_inc (&self->ref_count);
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return instance;
+#line 1529 "TumblrPublishing.c"
+}
+
+
+void
+publishing_tumblr_size_entry_unref (gpointer instance)
+{
+	PublishingTumblrSizeEntry * self;
+	self = instance;
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (g_atomic_int_dec_and_test (&self->ref_count)) {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		PUBLISHING_TUMBLR_SIZE_ENTRY_GET_CLASS (self)->finalize (self);
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_type_free_instance ((GTypeInstance *) self);
+#line 1544 "TumblrPublishing.c"
+	}
+}
+
+
+static void
+_publishing_tumblr_tumblr_publisher_on_authenticator_authenticated_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender,
+                                                                                                                gpointer self)
+{
+#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_on_authenticator_authenticated ((PublishingTumblrTumblrPublisher*) self);
+#line 1555 "TumblrPublishing.c"
+}
+
+
+static void
+_vala_array_add31 (PublishingTumblrSizeEntry** * array,
+                   int* length,
+                   int* size,
+                   PublishingTumblrSizeEntry* value)
+{
+#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if ((*length) == (*size)) {
+#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		*size = (*size) ? (2 * (*size)) : 4;
+#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		*array = g_renew (PublishingTumblrSizeEntry*, *array, (*size) + 1);
+#line 1571 "TumblrPublishing.c"
+	}
+#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(*array)[(*length)++] = value;
+#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(*array)[*length] = NULL;
+#line 1577 "TumblrPublishing.c"
+}
+
+
+static void
+_vala_array_add32 (PublishingTumblrSizeEntry** * array,
+                   int* length,
+                   int* size,
+                   PublishingTumblrSizeEntry* value)
+{
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if ((*length) == (*size)) {
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		*size = (*size) ? (2 * (*size)) : 4;
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		*array = g_renew (PublishingTumblrSizeEntry*, *array, (*size) + 1);
+#line 1593 "TumblrPublishing.c"
+	}
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(*array)[(*length)++] = value;
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(*array)[*length] = NULL;
+#line 1599 "TumblrPublishing.c"
+}
+
+
+static void
+_vala_array_add33 (PublishingTumblrSizeEntry** * array,
+                   int* length,
+                   int* size,
+                   PublishingTumblrSizeEntry* value)
+{
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if ((*length) == (*size)) {
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		*size = (*size) ? (2 * (*size)) : 4;
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		*array = g_renew (PublishingTumblrSizeEntry*, *array, (*size) + 1);
+#line 1615 "TumblrPublishing.c"
+	}
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(*array)[(*length)++] = value;
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(*array)[*length] = NULL;
+#line 1621 "TumblrPublishing.c"
+}
+
+
+static PublishingTumblrSizeEntry**
+publishing_tumblr_tumblr_publisher_create_sizes (PublishingTumblrTumblrPublisher* self,
+                                                 int* result_length1)
+{
+	PublishingTumblrSizeEntry** result = NULL;
+	PublishingTumblrSizeEntry** _result_ = NULL;
+	PublishingTumblrSizeEntry** _tmp0_;
+	gint _result__length1;
+	gint __result__size_;
+	PublishingTumblrSizeEntry** _tmp1_;
+	gint _tmp1__length1;
+	PublishingTumblrSizeEntry* _tmp2_;
+	PublishingTumblrSizeEntry** _tmp3_;
+	gint _tmp3__length1;
+	PublishingTumblrSizeEntry* _tmp4_;
+	PublishingTumblrSizeEntry** _tmp5_;
+	gint _tmp5__length1;
+	PublishingTumblrSizeEntry* _tmp6_;
+	PublishingTumblrSizeEntry** _tmp7_;
+	gint _tmp7__length1;
+#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), NULL);
+#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = g_new0 (PublishingTumblrSizeEntry*, 0 + 1);
+#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_result_ = _tmp0_;
+#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_result__length1 = 0;
+#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	__result__size_ = _result__length1;
+#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = _result_;
+#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1__length1 = _result__length1;
+#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2_ = publishing_tumblr_size_entry_new (_ ("500 × 375 pixels"), 500);
+#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_vala_array_add31 (&_result_, &_result__length1, &__result__size_, _tmp2_);
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp3_ = _result_;
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp3__length1 = _result__length1;
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp4_ = publishing_tumblr_size_entry_new (_ ("1024 × 768 pixels"), 1024);
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_vala_array_add32 (&_result_, &_result__length1, &__result__size_, _tmp4_);
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp5_ = _result_;
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp5__length1 = _result__length1;
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp6_ = publishing_tumblr_size_entry_new (_ ("1280 × 853 pixels"), 1280);
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_vala_array_add33 (&_result_, &_result__length1, &__result__size_, _tmp6_);
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp7_ = _result_;
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp7__length1 = _result__length1;
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (result_length1) {
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		*result_length1 = _tmp7__length1;
+#line 1687 "TumblrPublishing.c"
+	}
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	result = _tmp7_;
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 1693 "TumblrPublishing.c"
+}
+
+
+static PublishingTumblrBlogEntry**
+publishing_tumblr_tumblr_publisher_create_blogs (PublishingTumblrTumblrPublisher* self,
+                                                 int* result_length1)
+{
+	PublishingTumblrBlogEntry** result = NULL;
+	PublishingTumblrBlogEntry** _result_ = NULL;
+	PublishingTumblrBlogEntry** _tmp0_;
+	gint _result__length1;
+	gint __result__size_;
+	PublishingTumblrBlogEntry** _tmp1_;
+	gint _tmp1__length1;
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), NULL);
+#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = g_new0 (PublishingTumblrBlogEntry*, 0 + 1);
+#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_result_ = _tmp0_;
+#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_result__length1 = 0;
+#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	__result__size_ = _result__length1;
+#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = _result_;
+#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1__length1 = _result__length1;
+#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (result_length1) {
+#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		*result_length1 = _tmp1__length1;
+#line 1726 "TumblrPublishing.c"
+	}
+#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	result = _tmp1_;
+#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 1732 "TumblrPublishing.c"
+}
+
+
+PublishingTumblrTumblrPublisher*
+publishing_tumblr_tumblr_publisher_construct (GType object_type,
+                                              SpitPublishingService* service,
+                                              SpitPublishingPluginHost* host)
+{
+	PublishingTumblrTumblrPublisher * self = NULL;
+	SpitPublishingService* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
+	PublishingRESTSupportOAuth1Session* _tmp2_;
+	gint _tmp3_;
+	PublishingTumblrSizeEntry** _tmp4_;
+	gint _tmp5_;
+	PublishingTumblrBlogEntry** _tmp6_;
+	PublishingAuthenticatorFactory* _tmp7_;
+	PublishingAuthenticatorFactory* _tmp8_;
+	SpitPublishingAuthenticator* _tmp9_;
+	SpitPublishingAuthenticator* _tmp10_;
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = (PublishingTumblrTumblrPublisher*) g_object_new (object_type, NULL);
+#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:123: TumblrPublisher instantiated.");
+#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = _g_object_ref0 (service);
+#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (self->priv->service);
+#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->service = _tmp0_;
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = _g_object_ref0 (host);
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (self->priv->host);
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->host = _tmp1_;
+#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2_ = publishing_rest_support_oauth1_session_new (PUBLISHING_TUMBLR_ENDPOINT_URL);
+#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_publishing_rest_support_session_unref0 (self->priv->session);
+#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->session = _tmp2_;
+#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp4_ = publishing_tumblr_tumblr_publisher_create_sizes (self, &_tmp3_);
+#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->sizes = (_vala_array_free (self->priv->sizes, self->priv->sizes_length1, (GDestroyNotify) publishing_tumblr_size_entry_unref), NULL);
+#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->sizes = _tmp4_;
+#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->sizes_length1 = _tmp3_;
+#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->_sizes_size_ = self->priv->sizes_length1;
+#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp6_ = publishing_tumblr_tumblr_publisher_create_blogs (self, &_tmp5_);
+#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->blogs = (_vala_array_free (self->priv->blogs, self->priv->blogs_length1, (GDestroyNotify) publishing_tumblr_blog_entry_unref), NULL);
+#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->blogs = _tmp6_;
+#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->blogs_length1 = _tmp5_;
+#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->_blogs_size_ = self->priv->blogs_length1;
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp7_ = publishing_authenticator_factory_get_instance ();
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp8_ = _tmp7_;
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp9_ = spit_publishing_authenticator_factory_create (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY, SpitPublishingAuthenticatorFactory), "tumblr", host);
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (self->priv->authenticator);
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->authenticator = _tmp9_;
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (_tmp8_);
+#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp10_ = self->priv->authenticator;
+#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_connect_object (_tmp10_, "authenticated", (GCallback) _publishing_tumblr_tumblr_publisher_on_authenticator_authenticated_spit_publishing_authenticator_authenticated, self, 0);
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return self;
+#line 1817 "TumblrPublishing.c"
+}
+
+
+PublishingTumblrTumblrPublisher*
+publishing_tumblr_tumblr_publisher_new (SpitPublishingService* service,
+                                        SpitPublishingPluginHost* host)
+{
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return publishing_tumblr_tumblr_publisher_construct (PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, service, host);
+#line 1827 "TumblrPublishing.c"
+}
+
+
+static SpitPublishingService*
+publishing_tumblr_tumblr_publisher_real_get_service (SpitPublishingPublisher* base)
+{
+	PublishingTumblrTumblrPublisher * self;
+	SpitPublishingService* result = NULL;
+	SpitPublishingService* _tmp0_;
+	SpitPublishingService* _tmp1_;
+#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisher);
+#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->service;
+#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	result = _tmp1_;
+#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 1848 "TumblrPublishing.c"
+}
+
+
+SpitPublishingPluginHost*
+publishing_tumblr_tumblr_publisher_get_host (PublishingTumblrTumblrPublisher* self)
+{
+	SpitPublishingPluginHost* result = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
+#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), NULL);
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->host;
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	result = _tmp1_;
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 1868 "TumblrPublishing.c"
+}
+
+
+static gboolean
+publishing_tumblr_tumblr_publisher_real_is_running (SpitPublishingPublisher* base)
+{
+	PublishingTumblrTumblrPublisher * self;
+	gboolean result = FALSE;
+	gboolean _tmp0_;
+#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisher);
+#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->running;
+#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	result = _tmp0_;
+#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 1886 "TumblrPublishing.c"
+}
+
+
+gint
+publishing_tumblr_tumblr_publisher_get_persistent_default_size (PublishingTumblrTumblrPublisher* self)
+{
+	gint result = 0;
+	SpitPublishingPluginHost* _tmp0_;
+#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), 0);
+#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->host;
+#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	result = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_size", 1);
+#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 1903 "TumblrPublishing.c"
+}
+
+
+void
+publishing_tumblr_tumblr_publisher_set_persistent_default_size (PublishingTumblrTumblrPublisher* self,
+                                                                gint size)
+{
+	SpitPublishingPluginHost* _tmp0_;
+#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
+#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->host;
+#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_size", size);
+#line 1918 "TumblrPublishing.c"
+}
+
+
+gint
+publishing_tumblr_tumblr_publisher_get_persistent_default_blog (PublishingTumblrTumblrPublisher* self)
+{
+	gint result = 0;
+	SpitPublishingPluginHost* _tmp0_;
+#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), 0);
+#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->host;
+#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	result = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_blog", 0);
+#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 1935 "TumblrPublishing.c"
+}
+
+
+void
+publishing_tumblr_tumblr_publisher_set_persistent_default_blog (PublishingTumblrTumblrPublisher* self,
+                                                                gint blog)
+{
+	SpitPublishingPluginHost* _tmp0_;
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
+#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->host;
+#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_blog", blog);
+#line 1950 "TumblrPublishing.c"
+}
+
+
+static gpointer
+_g_variant_ref0 (gpointer self)
+{
+#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return self ? g_variant_ref (self) : NULL;
+#line 1959 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_tumblr_publisher_on_authenticator_authenticated (PublishingTumblrTumblrPublisher* self)
+{
+	GHashTable* params = NULL;
+	SpitPublishingAuthenticator* _tmp0_;
+	GHashTable* _tmp1_;
+	GVariant* consumer_key = NULL;
+	GVariant* consumer_secret = NULL;
+	GVariant* auth_token = NULL;
+	GVariant* auth_token_secret = NULL;
+	GHashTable* _tmp2_;
+	gconstpointer _tmp3_ = NULL;
+	GVariant* _tmp4_;
+	GHashTable* _tmp5_;
+	gconstpointer _tmp6_ = NULL;
+	GVariant* _tmp7_;
+	PublishingRESTSupportOAuth1Session* _tmp8_;
+	GVariant* _tmp9_;
+	const gchar* _tmp10_;
+	GVariant* _tmp11_;
+	const gchar* _tmp12_;
+	GHashTable* _tmp13_;
+	gconstpointer _tmp14_ = NULL;
+	GVariant* _tmp15_;
+	GHashTable* _tmp16_;
+	gconstpointer _tmp17_ = NULL;
+	GVariant* _tmp18_;
+	PublishingRESTSupportOAuth1Session* _tmp19_;
+	GVariant* _tmp20_;
+	const gchar* _tmp21_;
+	GVariant* _tmp22_;
+	const gchar* _tmp23_;
+#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
+#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
+#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		return;
+#line 2001 "TumblrPublishing.c"
+	}
+#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:174: EVENT: a fully authenticated session has be" \
+"come available");
+#line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->authenticator;
+#line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = spit_publishing_authenticator_get_authentication_parameter (_tmp0_);
+#line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	params = _tmp1_;
+#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	consumer_key = NULL;
+#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	consumer_secret = NULL;
+#line 179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	auth_token = NULL;
+#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	auth_token_secret = NULL;
+#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2_ = params;
+#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_hash_table_lookup_extended (_tmp2_, "ConsumerKey", NULL, &_tmp3_);
+#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_variant_unref0 (consumer_key);
+#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp4_ = _g_variant_ref0 (_tmp3_);
+#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	consumer_key = _tmp4_;
+#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp5_ = params;
+#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_hash_table_lookup_extended (_tmp5_, "ConsumerSecret", NULL, &_tmp6_);
+#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_variant_unref0 (consumer_secret);
+#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp7_ = _g_variant_ref0 (_tmp6_);
+#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	consumer_secret = _tmp7_;
+#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp8_ = self->priv->session;
+#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp9_ = consumer_key;
+#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp10_ = g_variant_get_string (_tmp9_, NULL);
+#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp11_ = consumer_secret;
+#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp12_ = g_variant_get_string (_tmp11_, NULL);
+#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_rest_support_oauth1_session_set_api_credentials (_tmp8_, _tmp10_, _tmp12_);
+#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp13_ = params;
+#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_hash_table_lookup_extended (_tmp13_, "AuthToken", NULL, &_tmp14_);
+#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_variant_unref0 (auth_token);
+#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp15_ = _g_variant_ref0 (_tmp14_);
+#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	auth_token = _tmp15_;
+#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp16_ = params;
+#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_hash_table_lookup_extended (_tmp16_, "AuthTokenSecret", NULL, &_tmp17_);
+#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_variant_unref0 (auth_token_secret);
+#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp18_ = _g_variant_ref0 (_tmp17_);
+#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	auth_token_secret = _tmp18_;
+#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp19_ = self->priv->session;
+#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp20_ = auth_token;
+#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp21_ = g_variant_get_string (_tmp20_, NULL);
+#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp22_ = auth_token_secret;
+#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp23_ = g_variant_get_string (_tmp22_, NULL);
+#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_rest_support_oauth1_session_set_access_phase_credentials (_tmp19_, _tmp21_, _tmp23_, "");
+#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_do_get_blogs (self);
+#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_variant_unref0 (auth_token_secret);
+#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_variant_unref0 (auth_token);
+#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_variant_unref0 (consumer_secret);
+#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_variant_unref0 (consumer_key);
+#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_hash_table_unref0 (params);
+#line 2095 "TumblrPublishing.c"
+}
+
+
+static void
+_publishing_tumblr_tumblr_publisher_on_info_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender,
+                                                                                                                 gpointer self)
+{
+#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_on_info_request_txn_completed ((PublishingTumblrTumblrPublisher*) self, _sender);
+#line 2105 "TumblrPublishing.c"
+}
+
+
+static void
+_publishing_tumblr_tumblr_publisher_on_info_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender,
+                                                                                                                 GError* err,
+                                                                                                                 gpointer self)
+{
+#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_on_info_request_txn_error ((PublishingTumblrTumblrPublisher*) self, _sender, err);
+#line 2116 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTumblrPublisher* self)
+{
+	PublishingTumblrTumblrPublisherUserInfoFetchTransaction* txn = NULL;
+	PublishingRESTSupportOAuth1Session* _tmp0_;
+	PublishingTumblrTumblrPublisherUserInfoFetchTransaction* _tmp1_;
+	GError * _inner_error_ = NULL;
+#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
+#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:196: ACTION: obtain all blogs of the tumblr user");
+#line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->session;
+#line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_new (_tmp0_);
+#line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	txn = _tmp1_;
+#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_tumblr_tumblr_publisher_on_info_request_txn_completed_publishing_rest_support_transaction_completed, self, 0);
+#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_tumblr_tumblr_publisher_on_info_request_txn_error_publishing_rest_support_transaction_network_error, self, 0);
+#line 2141 "TumblrPublishing.c"
+	{
+#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
+#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
+#line 2149 "TumblrPublishing.c"
+				goto __catch20_spit_publishing_publishing_error;
+			}
+#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_publishing_rest_support_transaction_unref0 (txn);
+#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.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 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			g_clear_error (&_inner_error_);
+#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			return;
+#line 2160 "TumblrPublishing.c"
+		}
+	}
+	goto __finally20;
+	__catch20_spit_publishing_publishing_error:
+	{
+		GError* err = NULL;
+		SpitPublishingPluginHost* _tmp2_;
+		GError* _tmp3_;
+#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		err = _inner_error_;
+#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_inner_error_ = NULL;
+#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp2_ = self->priv->host;
+#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp3_ = err;
+#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		spit_publishing_plugin_host_post_error (_tmp2_, _tmp3_);
+#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_error_free0 (err);
+#line 2181 "TumblrPublishing.c"
+	}
+	__finally20:
+#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_publishing_rest_support_transaction_unref0 (txn);
+#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.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 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_clear_error (&_inner_error_);
+#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		return;
+#line 2194 "TumblrPublishing.c"
+	}
+#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_publishing_rest_support_transaction_unref0 (txn);
+#line 2198 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_tumblr_publisher_on_info_request_txn_completed (PublishingTumblrTumblrPublisher* self,
+                                                                  PublishingRESTSupportTransaction* txn)
+{
+	guint _tmp0_;
+	guint _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
+#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
+#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
+#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_info_request_txn_completed_publishing_rest_support_transaction_completed, self);
+#line 213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+#line 213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_info_request_txn_error_publishing_rest_support_transaction_network_error, self);
+#line 215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
+#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		return;
+#line 2228 "TumblrPublishing.c"
+	}
+#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2_ = publishing_rest_support_transaction_get_response (txn);
+#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp3_ = _tmp2_;
+#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:218: EVENT: user info request transaction comple" \
+"ted; response = '%s'", _tmp3_);
+#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 (_tmp3_);
+#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp4_ = publishing_rest_support_transaction_get_response (txn);
+#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp5_ = _tmp4_;
+#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_request (self, _tmp5_);
+#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 (_tmp5_);
+#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_do_show_publishing_options_pane (self);
+#line 2248 "TumblrPublishing.c"
+}
+
+
+static gpointer
+_json_object_ref0 (gpointer self)
+{
+#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return self ? json_object_ref (self) : NULL;
+#line 2257 "TumblrPublishing.c"
+}
+
+
+static gchar*
+string_replace (const gchar* self,
+                const gchar* old,
+                const gchar* replacement)
+{
+	gchar* result = NULL;
+	gboolean _tmp0_ = FALSE;
+	gboolean _tmp1_ = FALSE;
+	GError * _inner_error_ = NULL;
+#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (self != NULL, NULL);
+#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (old != NULL, NULL);
+#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (replacement != NULL, NULL);
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if ((*((gchar*) self)) == '\0') {
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp1_ = TRUE;
+#line 2280 "TumblrPublishing.c"
+	} else {
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp1_ = (*((gchar*) old)) == '\0';
+#line 2284 "TumblrPublishing.c"
+	}
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (_tmp1_) {
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp0_ = TRUE;
+#line 2290 "TumblrPublishing.c"
+	} else {
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp0_ = g_strcmp0 (old, replacement) == 0;
+#line 2294 "TumblrPublishing.c"
+	}
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (_tmp0_) {
+#line 2298 "TumblrPublishing.c"
+		gchar* _tmp2_;
+#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp2_ = g_strdup (self);
+#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		result = _tmp2_;
+#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		return result;
+#line 2306 "TumblrPublishing.c"
+	}
+	{
+		GRegex* regex = NULL;
+		gchar* _tmp3_;
+		gchar* _tmp4_;
+		GRegex* _tmp5_;
+		GRegex* _tmp6_;
+		gchar* _tmp7_ = NULL;
+		GRegex* _tmp8_;
+		gchar* _tmp9_;
+		gchar* _tmp10_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp3_ = g_regex_escape_string (old, -1);
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp4_ = _tmp3_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp5_ = g_regex_new (_tmp4_, 0, 0, &_inner_error_);
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp6_ = _tmp5_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp4_);
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		regex = _tmp6_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+			if (_inner_error_->domain == G_REGEX_ERROR) {
+#line 2334 "TumblrPublishing.c"
+				goto __catch22_g_regex_error;
+			}
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+			g_clear_error (&_inner_error_);
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+			return NULL;
+#line 2343 "TumblrPublishing.c"
+		}
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp8_ = regex;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp9_ = g_regex_replace_literal (_tmp8_, self, (gssize) -1, 0, replacement, 0, &_inner_error_);
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp7_ = _tmp9_;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+			_g_regex_unref0 (regex);
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+			if (_inner_error_->domain == G_REGEX_ERROR) {
+#line 2357 "TumblrPublishing.c"
+				goto __catch22_g_regex_error;
+			}
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+			_g_regex_unref0 (regex);
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+			g_clear_error (&_inner_error_);
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+			return NULL;
+#line 2368 "TumblrPublishing.c"
+		}
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp10_ = _tmp7_;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp7_ = NULL;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		result = _tmp10_;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp7_);
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_g_regex_unref0 (regex);
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		return result;
+#line 2382 "TumblrPublishing.c"
+	}
+	goto __finally22;
+	__catch22_g_regex_error:
+	{
+		GError* e = NULL;
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		e = _inner_error_;
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_inner_error_ = NULL;
+#line 1429 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		g_assert_not_reached ();
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_g_error_free0 (e);
+#line 2396 "TumblrPublishing.c"
+	}
+	__finally22:
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		g_clear_error (&_inner_error_);
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		return NULL;
+#line 2407 "TumblrPublishing.c"
+	}
+}
+
+
+static void
+_vala_array_add34 (PublishingTumblrBlogEntry** * array,
+                   int* length,
+                   int* size,
+                   PublishingTumblrBlogEntry* value)
+{
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if ((*length) == (*size)) {
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		*size = (*size) ? (2 * (*size)) : 4;
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		*array = g_renew (PublishingTumblrBlogEntry*, *array, (*size) + 1);
+#line 2424 "TumblrPublishing.c"
+	}
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(*array)[(*length)++] = value;
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(*array)[*length] = NULL;
+#line 2430 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_request (PublishingTumblrTumblrPublisher* self,
+                                                                          const gchar* response)
+{
+	GError * _inner_error_ = NULL;
+#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
+#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (response != NULL);
+#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:226: ACTION: parsing info request response '%s' " \
+"into list of available blogs", response);
+#line 2445 "TumblrPublishing.c"
+	{
+		JsonParser* parser = NULL;
+		JsonParser* _tmp0_;
+		JsonObject* root_object = NULL;
+		JsonNode* _tmp1_;
+		JsonObject* _tmp2_;
+		JsonObject* _tmp3_;
+		JsonObject* _tmp4_;
+		JsonObject* _tmp5_;
+		JsonObject* _tmp6_;
+		const gchar* _tmp7_;
+		gchar* _tmp8_;
+		const gchar* _tmp9_;
+		JsonObject* _tmp10_;
+		JsonObject* _tmp11_;
+		JsonObject* _tmp12_;
+		JsonArray* _tmp13_;
+		GList* _tmp14_;
+#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp0_ = json_parser_new ();
+#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		parser = _tmp0_;
+#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		json_parser_load_from_data (parser, response, (gssize) -1, &_inner_error_);
+#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_g_object_unref0 (parser);
+#line 2474 "TumblrPublishing.c"
+			goto __catch21_g_error;
+		}
+#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp1_ = json_parser_get_root (parser);
+#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp2_ = json_node_get_object (_tmp1_);
+#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp3_ = _json_object_ref0 (_tmp2_);
+#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		root_object = _tmp3_;
+#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp4_ = root_object;
+#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp5_ = json_object_get_object_member (_tmp4_, "response");
+#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp6_ = json_object_get_object_member (_tmp5_, "user");
+#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp7_ = json_object_get_string_member (_tmp6_, "name");
+#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp8_ = g_strdup (_tmp7_);
+#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_free0 (self->priv->username);
+#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		self->priv->username = _tmp8_;
+#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp9_ = self->priv->username;
+#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_debug ("TumblrPublishing.vala:232: Got user name: %s", _tmp9_);
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp10_ = root_object;
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp11_ = json_object_get_object_member (_tmp10_, "response");
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp12_ = json_object_get_object_member (_tmp11_, "user");
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp13_ = json_object_get_array_member (_tmp12_, "blogs");
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp14_ = json_array_get_elements (_tmp13_);
+#line 2513 "TumblrPublishing.c"
+		{
+			GList* blognode_collection = NULL;
+			GList* blognode_it = NULL;
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			blognode_collection = _tmp14_;
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			for (blognode_it = blognode_collection; blognode_it != NULL; blognode_it = blognode_it->next) {
+#line 2521 "TumblrPublishing.c"
+				JsonNode* blognode = NULL;
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+				blognode = (JsonNode*) blognode_it->data;
+#line 2525 "TumblrPublishing.c"
+				{
+					JsonObject* blog = NULL;
+					JsonNode* _tmp15_;
+					JsonObject* _tmp16_;
+					JsonObject* _tmp17_;
+					gchar* name = NULL;
+					JsonObject* _tmp18_;
+					const gchar* _tmp19_;
+					gchar* _tmp20_;
+					gchar* url = NULL;
+					JsonObject* _tmp21_;
+					const gchar* _tmp22_;
+					gchar* _tmp23_;
+					gchar* _tmp24_;
+					gchar* _tmp25_;
+					gchar* _tmp26_;
+					const gchar* _tmp27_;
+					const gchar* _tmp28_;
+					PublishingTumblrBlogEntry** _tmp29_;
+					gint _tmp29__length1;
+					const gchar* _tmp30_;
+					const gchar* _tmp31_;
+					PublishingTumblrBlogEntry* _tmp32_;
+#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp15_ = blognode;
+#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp16_ = json_node_get_object (_tmp15_);
+#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp17_ = _json_object_ref0 (_tmp16_);
+#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					blog = _tmp17_;
+#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp18_ = blog;
+#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp19_ = json_object_get_string_member (_tmp18_, "name");
+#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp20_ = g_strdup (_tmp19_);
+#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					name = _tmp20_;
+#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp21_ = blog;
+#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp22_ = json_object_get_string_member (_tmp21_, "url");
+#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp23_ = string_replace (_tmp22_, "http://", "");
+#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp24_ = _tmp23_;
+#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp25_ = string_replace (_tmp24_, "/", "");
+#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp26_ = _tmp25_;
+#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_g_free0 (_tmp24_);
+#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					url = _tmp26_;
+#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp27_ = name;
+#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp28_ = url;
+#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					g_debug ("TumblrPublishing.vala:237: Got blog name: %s and url: %s", _tmp27_, _tmp28_);
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp29_ = self->priv->blogs;
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp29__length1 = self->priv->blogs_length1;
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp30_ = name;
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp31_ = url;
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp32_ = publishing_tumblr_blog_entry_new (_tmp30_, _tmp31_);
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_vala_array_add34 (&self->priv->blogs, &self->priv->blogs_length1, &self->priv->_blogs_size_, _tmp32_);
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_g_free0 (url);
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_g_free0 (name);
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_json_object_unref0 (blog);
+#line 2605 "TumblrPublishing.c"
+				}
+			}
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_g_list_free0 (blognode_collection);
+#line 2610 "TumblrPublishing.c"
+		}
+#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_json_object_unref0 (root_object);
+#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_object_unref0 (parser);
+#line 2616 "TumblrPublishing.c"
+	}
+	goto __finally21;
+	__catch21_g_error:
+	{
+		GError* err = NULL;
+		SpitPublishingPluginHost* _tmp33_;
+		GError* _tmp34_;
+#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		err = _inner_error_;
+#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_inner_error_ = NULL;
+#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp33_ = self->priv->host;
+#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp34_ = err;
+#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		spit_publishing_plugin_host_post_error (_tmp33_, _tmp34_);
+#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_error_free0 (err);
+#line 2636 "TumblrPublishing.c"
+	}
+	__finally21:
+#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.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 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_clear_error (&_inner_error_);
+#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		return;
+#line 2647 "TumblrPublishing.c"
+	}
+}
+
+
+static void
+publishing_tumblr_tumblr_publisher_on_info_request_txn_error (PublishingTumblrTumblrPublisher* self,
+                                                              PublishingRESTSupportTransaction* txn,
+                                                              GError* err)
+{
+	guint _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportOAuth1Session* _tmp2_;
+	SpitPublishingPluginHost* _tmp3_;
+#line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
+#line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
+#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
+#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_info_request_txn_completed_publishing_rest_support_transaction_completed, self);
+#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_info_request_txn_error_publishing_rest_support_transaction_network_error, self);
+#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
+#line 251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		return;
+#line 2677 "TumblrPublishing.c"
+	}
+#line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2_ = self->priv->session;
+#line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_rest_support_oauth1_session_deauthenticate (_tmp2_);
+#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:255: EVENT: user info request transaction caused" \
+" a network error");
+#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp3_ = self->priv->host;
+#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	spit_publishing_plugin_host_post_error (_tmp3_, err);
+#line 2689 "TumblrPublishing.c"
+}
+
+
+static void
+_publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender,
+                                                                                                                                           gpointer self)
+{
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish ((PublishingTumblrTumblrPublisher*) self);
+#line 2699 "TumblrPublishing.c"
+}
+
+
+static void
+_publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender,
+                                                                                                                                         gpointer self)
+{
+#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout ((PublishingTumblrTumblrPublisher*) self);
+#line 2709 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_tumblr_publisher_do_show_publishing_options_pane (PublishingTumblrTumblrPublisher* self)
+{
+	SpitPublishingPluginHost* _tmp0_;
+	PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_options_pane = NULL;
+	SpitPublishingPluginHost* _tmp1_;
+	PublishingTumblrSizeEntry** _tmp2_;
+	gint _tmp2__length1;
+	PublishingTumblrBlogEntry** _tmp3_;
+	gint _tmp3__length1;
+	const gchar* _tmp4_;
+	PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp5_;
+	SpitPublishingPluginHost* _tmp6_;
+#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
+#line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:260: ACTION: displaying publishing options pane");
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->host;
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = self->priv->host;
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2_ = self->priv->sizes;
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2__length1 = self->priv->sizes_length1;
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp3_ = self->priv->blogs;
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp3__length1 = self->priv->blogs_length1;
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp4_ = self->priv->username;
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp5_ = publishing_tumblr_tumblr_publisher_publishing_options_pane_new (self, spit_publishing_plugin_host_get_publishable_media_type (_tmp1_), _tmp2_, _tmp2__length1, _tmp3_, _tmp3__length1, _tmp4_);
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_options_pane = _tmp5_;
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_connect_object (publishing_options_pane, "publish", (GCallback) _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish, self, 0);
+#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_connect_object (publishing_options_pane, "logout", (GCallback) _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout, self, 0);
+#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp6_ = self->priv->host;
+#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	spit_publishing_plugin_host_install_dialog_pane (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (publishing_options_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (publishing_options_pane);
+#line 2760 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish (PublishingTumblrTumblrPublisher* self)
+{
+	PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp0_;
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->publishing_options_pane;
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (_tmp0_ != NULL) {
+#line 2774 "TumblrPublishing.c"
+		PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp1_;
+		guint _tmp2_;
+		PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp3_;
+		guint _tmp4_;
+#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp1_ = self->priv->publishing_options_pane;
+#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_signal_parse_name ("publish", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp2_, NULL, FALSE);
+#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_signal_handlers_disconnect_matched (_tmp1_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish, self);
+#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp3_ = self->priv->publishing_options_pane;
+#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_signal_parse_name ("logout", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp4_, NULL, FALSE);
+#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout, self);
+#line 2791 "TumblrPublishing.c"
+	}
+#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		return;
+#line 2797 "TumblrPublishing.c"
+	}
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:280: EVENT: user clicked the 'Publish' button in" \
+" the publishing options pane");
+#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_do_publish (self);
+#line 2803 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout (PublishingTumblrTumblrPublisher* self)
+{
+	PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp0_;
+#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->publishing_options_pane;
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (_tmp0_ != NULL) {
+#line 2817 "TumblrPublishing.c"
+		PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp1_;
+		guint _tmp2_;
+		PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp3_;
+		guint _tmp4_;
+#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp1_ = self->priv->publishing_options_pane;
+#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_signal_parse_name ("publish", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp2_, NULL, FALSE);
+#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_signal_handlers_disconnect_matched (_tmp1_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish, self);
+#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp3_ = self->priv->publishing_options_pane;
+#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_signal_parse_name ("logout", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp4_, NULL, FALSE);
+#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout, self);
+#line 2834 "TumblrPublishing.c"
+	}
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		return;
+#line 2840 "TumblrPublishing.c"
+	}
+#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:293: EVENT: user clicked the 'Logout' button in " \
+"the publishing options pane");
+#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_do_logout (self);
+#line 2846 "TumblrPublishing.c"
+}
+
+
+gint
+publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func (SpitPublishingPublishable* a,
+                                                                  SpitPublishingPublishable* b)
+{
+	gint result = 0;
+	GDateTime* _tmp0_;
+	GDateTime* _tmp1_;
+	GDateTime* _tmp2_;
+	GDateTime* _tmp3_;
+	gint _tmp4_;
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (a), 0);
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (b), 0);
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = spit_publishing_publishable_get_exposure_date_time (a);
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = _tmp0_;
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2_ = spit_publishing_publishable_get_exposure_date_time (b);
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp3_ = _tmp2_;
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp4_ = g_date_time_compare (_tmp1_, _tmp3_);
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_date_time_unref0 (_tmp3_);
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_date_time_unref0 (_tmp1_);
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	result = _tmp4_;
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 2882 "TumblrPublishing.c"
+}
+
+
+static gint
+_publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func_gcompare_data_func (gconstpointer a,
+                                                                                      gconstpointer b,
+                                                                                      gpointer self)
+{
+	gint result;
+	result = publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func ((SpitPublishingPublishable*) a, (SpitPublishingPublishable*) b);
+#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 2895 "TumblrPublishing.c"
+}
+
+
+static void
+_publishing_tumblr_tumblr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender,
+                                                                                                               gint num_photos_published,
+                                                                                                               gpointer self)
+{
+#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_on_upload_complete ((PublishingTumblrTumblrPublisher*) self, _sender, num_photos_published);
+#line 2906 "TumblrPublishing.c"
+}
+
+
+static void
+_publishing_tumblr_tumblr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender,
+                                                                                                         GError* err,
+                                                                                                         gpointer self)
+{
+#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_on_upload_error ((PublishingTumblrTumblrPublisher*) self, _sender, err);
+#line 2917 "TumblrPublishing.c"
+}
+
+
+static void
+_publishing_tumblr_tumblr_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number,
+                                                                                                gdouble fraction_complete,
+                                                                                                gpointer self)
+{
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_on_upload_status_updated ((PublishingTumblrTumblrPublisher*) self, file_number, fraction_complete);
+#line 2928 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumblrPublisher* self)
+{
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
+	PublishingTumblrSizeEntry** _tmp2_;
+	gint _tmp2__length1;
+	PublishingTumblrSizeEntry* _tmp3_;
+	gint _tmp4_;
+	void* _tmp5_;
+	GDestroyNotify _tmp6_;
+	SpitPublishingProgressCallback _tmp7_;
+	SpitPublishingPublishable** publishables = NULL;
+	SpitPublishingPluginHost* _tmp8_;
+	gint _tmp9_;
+	SpitPublishingPublishable** _tmp10_;
+	gint publishables_length1;
+	gint _publishables_size_;
+	GeeArrayList* sorted_list = NULL;
+	GeeArrayList* _tmp11_;
+	SpitPublishingPublishable** _tmp12_;
+	gint _tmp12__length1;
+	GeeArrayList* _tmp16_;
+	gchar* blog_url = NULL;
+	PublishingTumblrBlogEntry** _tmp17_;
+	gint _tmp17__length1;
+	PublishingTumblrBlogEntry* _tmp18_;
+	const gchar* _tmp19_;
+	gchar* _tmp20_;
+	PublishingTumblrTumblrPublisherUploader* uploader = NULL;
+	PublishingRESTSupportOAuth1Session* _tmp21_;
+	GeeArrayList* _tmp22_;
+	gint _tmp23_;
+	gpointer* _tmp24_;
+	SpitPublishingPublishable** _tmp25_;
+	gint _tmp25__length1;
+	const gchar* _tmp26_;
+	PublishingTumblrTumblrPublisherUploader* _tmp27_;
+	PublishingTumblrTumblrPublisherUploader* _tmp28_;
+	PublishingTumblrTumblrPublisherUploader* _tmp29_;
+	PublishingTumblrTumblrPublisherUploader* _tmp30_;
+	PublishingTumblrTumblrPublisherUploader* _tmp31_;
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
+#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:304: ACTION: uploading media items to remote ser" \
+"ver.");
+#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->host;
+#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = self->priv->host;
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2_ = self->priv->sizes;
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2__length1 = self->priv->sizes_length1;
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp3_ = _tmp2_[publishing_tumblr_tumblr_publisher_get_persistent_default_size (self)];
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp4_ = _tmp3_->size;
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp7_ = spit_publishing_plugin_host_serialize_publishables (_tmp1_, _tmp4_, FALSE, &_tmp5_, &_tmp6_);
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->progress_reporter = NULL;
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->progress_reporter_target = NULL;
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->progress_reporter_target_destroy_notify = NULL;
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->progress_reporter = _tmp7_;
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->progress_reporter_target = _tmp5_;
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->progress_reporter_target_destroy_notify = _tmp6_;
+#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
+#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		return;
+#line 3012 "TumblrPublishing.c"
+	}
+#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp8_ = self->priv->host;
+#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp10_ = spit_publishing_plugin_host_get_publishables (_tmp8_, &_tmp9_);
+#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishables = _tmp10_;
+#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishables_length1 = _tmp9_;
+#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_publishables_size_ = publishables_length1;
+#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp11_ = gee_array_list_new (SPIT_PUBLISHING_TYPE_PUBLISHABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	sorted_list = _tmp11_;
+#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp12_ = publishables;
+#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp12__length1 = publishables_length1;
+#line 3032 "TumblrPublishing.c"
+	{
+		SpitPublishingPublishable** p_collection = NULL;
+		gint p_collection_length1 = 0;
+		gint _p_collection_size_ = 0;
+		gint p_it = 0;
+#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		p_collection = _tmp12_;
+#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		p_collection_length1 = _tmp12__length1;
+#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		for (p_it = 0; p_it < _tmp12__length1; p_it = p_it + 1) {
+#line 3044 "TumblrPublishing.c"
+			SpitPublishingPublishable* _tmp13_;
+			SpitPublishingPublishable* p = NULL;
+#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_tmp13_ = _g_object_ref0 (p_collection[p_it]);
+#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			p = _tmp13_;
+#line 3051 "TumblrPublishing.c"
+			{
+				GeeArrayList* _tmp14_;
+				SpitPublishingPublishable* _tmp15_;
+#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+				g_debug ("TumblrPublishing.vala:322: ACTION: add publishable");
+#line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+				_tmp14_ = sorted_list;
+#line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+				_tmp15_ = p;
+#line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp15_);
+#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+				_g_object_unref0 (p);
+#line 3065 "TumblrPublishing.c"
+			}
+		}
+	}
+#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp16_ = sorted_list;
+#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	gee_list_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_LIST, GeeList), _publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func_gcompare_data_func, NULL, NULL);
+#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp17_ = self->priv->blogs;
+#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp17__length1 = self->priv->blogs_length1;
+#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp18_ = _tmp17_[publishing_tumblr_tumblr_publisher_get_persistent_default_blog (self)];
+#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp19_ = _tmp18_->url;
+#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp20_ = g_strdup (_tmp19_);
+#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	blog_url = _tmp20_;
+#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp21_ = self->priv->session;
+#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp22_ = sorted_list;
+#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp24_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), &_tmp23_);
+#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp25_ = _tmp24_;
+#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp25__length1 = _tmp23_;
+#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp26_ = blog_url;
+#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp27_ = publishing_tumblr_tumblr_publisher_uploader_new (_tmp21_, _tmp25_, _tmp23_, _tmp26_);
+#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp28_ = _tmp27_;
+#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp25_ = (_vala_array_free (_tmp25_, _tmp25__length1, (GDestroyNotify) g_object_unref), NULL);
+#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	uploader = _tmp28_;
+#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp29_ = uploader;
+#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-complete", (GCallback) _publishing_tumblr_tumblr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self, 0);
+#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp30_ = uploader;
+#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-error", (GCallback) _publishing_tumblr_tumblr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self, 0);
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp31_ = uploader;
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_rest_support_batch_uploader_upload (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), _publishing_tumblr_tumblr_publisher_on_upload_status_updated_spit_publishing_progress_callback, self);
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_publishing_rest_support_batch_uploader_unref0 (uploader);
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 (blog_url);
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (sorted_list);
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
+#line 3125 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_tumblr_publisher_do_show_success_pane (PublishingTumblrTumblrPublisher* self)
+{
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
+#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
+#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:335: ACTION: showing success pane.");
+#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->host;
+#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
+#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = self->priv->host;
+#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	spit_publishing_plugin_host_install_success_pane (_tmp1_);
+#line 3146 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_tumblr_publisher_on_upload_status_updated (PublishingTumblrTumblrPublisher* self,
+                                                             gint file_number,
+                                                             gdouble completed_fraction)
+{
+	SpitPublishingProgressCallback _tmp0_;
+	void* _tmp0__target;
+	SpitPublishingProgressCallback _tmp1_;
+	void* _tmp1__target;
+#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
+#line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		return;
+#line 3165 "TumblrPublishing.c"
+	}
+#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:346: EVENT: uploader reports upload %.2f percent" \
+" complete.", 100.0 * completed_fraction);
+#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->progress_reporter;
+#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0__target = self->priv->progress_reporter_target;
+#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_vala_assert (_tmp0_ != NULL, "progress_reporter != null");
+#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = self->priv->progress_reporter;
+#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1__target = self->priv->progress_reporter_target;
+#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ (file_number, completed_fraction, _tmp1__target);
+#line 3181 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_tumblr_publisher_on_upload_complete (PublishingTumblrTumblrPublisher* self,
+                                                       PublishingRESTSupportBatchUploader* uploader,
+                                                       gint num_published)
+{
+	guint _tmp0_;
+	guint _tmp1_;
+#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
+#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
+#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
+#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		return;
+#line 3200 "TumblrPublishing.c"
+	}
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:358: EVENT: uploader reports upload complete; %d" \
+" items published.", num_published);
+#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp0_, NULL, FALSE);
+#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
+#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_do_show_success_pane (self);
+#line 3214 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_tumblr_publisher_on_upload_error (PublishingTumblrTumblrPublisher* self,
+                                                    PublishingRESTSupportBatchUploader* uploader,
+                                                    GError* err)
+{
+	const gchar* _tmp0_;
+	guint _tmp1_;
+	guint _tmp2_;
+	SpitPublishingPluginHost* _tmp3_;
+#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
+#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
+#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
+#line 369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		return;
+#line 3235 "TumblrPublishing.c"
+	}
+#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = err->message;
+#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:371: EVENT: uploader reports upload error = '%s'" \
+".", _tmp0_);
+#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
+#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
+#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp2_, NULL, FALSE);
+#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp3_ = self->priv->host;
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	spit_publishing_plugin_host_post_error (_tmp3_, err);
+#line 3253 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_tumblr_publisher_do_logout (PublishingTumblrTumblrPublisher* self)
+{
+	SpitPublishingAuthenticator* _tmp0_;
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
+#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:381: ACTION: logging user out, deauthenticating " \
+"session, and erasing stored credentials");
+#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->authenticator;
+#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (spit_publishing_authenticator_can_logout (_tmp0_)) {
+#line 3269 "TumblrPublishing.c"
+		SpitPublishingAuthenticator* _tmp1_;
+#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp1_ = self->priv->authenticator;
+#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		spit_publishing_authenticator_logout (_tmp1_);
+#line 3275 "TumblrPublishing.c"
+	}
+#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->running = FALSE;
+#line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_attempt_start (self);
+#line 3281 "TumblrPublishing.c"
+}
+
+
+void
+publishing_tumblr_tumblr_publisher_attempt_start (PublishingTumblrTumblrPublisher* self)
+{
+	SpitPublishingAuthenticator* _tmp0_;
+#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
+#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
+#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		return;
+#line 3295 "TumblrPublishing.c"
+	}
+#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:396: TumblrPublisher: starting interaction.");
+#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->running = TRUE;
+#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->authenticator;
+#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	spit_publishing_authenticator_authenticate (_tmp0_);
+#line 3305 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_tumblr_publisher_real_start (SpitPublishingPublisher* base)
+{
+	PublishingTumblrTumblrPublisher * self;
+	gboolean _tmp0_;
+#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisher);
+#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) {
+#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		return;
+#line 3320 "TumblrPublishing.c"
+	}
+#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->was_started;
+#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (_tmp0_) {
+#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_error ("TumblrPublishing.vala:407: %s", _ ("TumblrPublisher: start( ): can’t start; this publisher is not restarta" \
+"ble."));
+#line 3328 "TumblrPublishing.c"
+	}
+#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:409: TumblrPublisher: starting interaction.");
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_attempt_start (self);
+#line 3334 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_tumblr_publisher_real_stop (SpitPublishingPublisher* base)
+{
+	PublishingTumblrTumblrPublisher * self;
+#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisher);
+#line 415 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:415: TumblrPublisher: stop( ) invoked.");
+#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->running = FALSE;
+#line 3348 "TumblrPublishing.c"
+}
+
+
+static gpointer
+_publishing_tumblr_size_entry_ref0 (gpointer self)
+{
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return self ? publishing_tumblr_size_entry_ref (self) : NULL;
+#line 3357 "TumblrPublishing.c"
+}
+
+
+static PublishingTumblrSizeEntry**
+_vala_array_dup9 (PublishingTumblrSizeEntry** self,
+                  int length)
+{
+	PublishingTumblrSizeEntry** result;
+	int i;
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	result = g_new0 (PublishingTumblrSizeEntry*, length + 1);
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	for (i = 0; i < length; i++) {
+#line 3371 "TumblrPublishing.c"
+		PublishingTumblrSizeEntry* _tmp0_;
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp0_ = _publishing_tumblr_size_entry_ref0 (self[i]);
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		result[i] = _tmp0_;
+#line 3377 "TumblrPublishing.c"
+	}
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 3381 "TumblrPublishing.c"
+}
+
+
+static gpointer
+_publishing_tumblr_blog_entry_ref0 (gpointer self)
+{
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return self ? publishing_tumblr_blog_entry_ref (self) : NULL;
+#line 3390 "TumblrPublishing.c"
+}
+
+
+static PublishingTumblrBlogEntry**
+_vala_array_dup10 (PublishingTumblrBlogEntry** self,
+                   int length)
+{
+	PublishingTumblrBlogEntry** result;
+	int i;
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	result = g_new0 (PublishingTumblrBlogEntry*, length + 1);
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	for (i = 0; i < length; i++) {
+#line 3404 "TumblrPublishing.c"
+		PublishingTumblrBlogEntry* _tmp0_;
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp0_ = _publishing_tumblr_blog_entry_ref0 (self[i]);
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		result[i] = _tmp0_;
+#line 3410 "TumblrPublishing.c"
+	}
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 3414 "TumblrPublishing.c"
+}
+
+
+static void
+_publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+                                                                                                   gpointer self)
+{
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
+#line 3424 "TumblrPublishing.c"
+}
+
+
+static void
+_publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+                                                                                                   gpointer self)
+{
+#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
+#line 3434 "TumblrPublishing.c"
+}
+
+
+static void
+_publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                                  gpointer self)
+{
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
+#line 3444 "TumblrPublishing.c"
+}
+
+
+static void
+_publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                                   gpointer self)
+{
+#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
+#line 3454 "TumblrPublishing.c"
+}
+
+
+PublishingTumblrTumblrPublisherPublishingOptionsPane*
+publishing_tumblr_tumblr_publisher_publishing_options_pane_construct (GType object_type,
+                                                                      PublishingTumblrTumblrPublisher* publisher,
+                                                                      SpitPublishingPublisherMediaType media_type,
+                                                                      PublishingTumblrSizeEntry** sizes,
+                                                                      int sizes_length1,
+                                                                      PublishingTumblrBlogEntry** blogs,
+                                                                      int blogs_length1,
+                                                                      const gchar* username)
+{
+	PublishingTumblrTumblrPublisherPublishingOptionsPane * self = NULL;
+	GtkBox* _tmp0_;
+	gchar* _tmp1_;
+	PublishingTumblrTumblrPublisher* _tmp2_;
+	PublishingTumblrSizeEntry** _tmp3_;
+	gint _tmp3__length1;
+	PublishingTumblrBlogEntry** _tmp4_;
+	gint _tmp4__length1;
+	GError * _inner_error_ = NULL;
+#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (publisher), NULL);
+#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (username != NULL, NULL);
+#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = (PublishingTumblrTumblrPublisherPublishingOptionsPane*) g_object_new (object_type, NULL);
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_object_ref_sink (_tmp0_);
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (self->priv->pane_widget);
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->pane_widget = _tmp0_;
+#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = g_strdup (username);
+#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 (self->priv->username);
+#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->username = _tmp1_;
+#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2_ = _g_object_ref0 (publisher);
+#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (self->priv->publisher);
+#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->publisher = _tmp2_;
+#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->media_type = media_type;
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp3_ = (sizes != NULL) ? _vala_array_dup9 (sizes, sizes_length1) : ((gpointer) sizes);
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp3__length1 = sizes_length1;
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->sizes = (_vala_array_free (self->priv->sizes, self->priv->sizes_length1, (GDestroyNotify) publishing_tumblr_size_entry_unref), NULL);
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->sizes = _tmp3_;
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->sizes_length1 = _tmp3__length1;
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->_sizes_size_ = self->priv->sizes_length1;
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp4_ = (blogs != NULL) ? _vala_array_dup10 (blogs, blogs_length1) : ((gpointer) blogs);
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp4__length1 = blogs_length1;
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->blogs = (_vala_array_free (self->priv->blogs, self->priv->blogs_length1, (GDestroyNotify) publishing_tumblr_blog_entry_unref), NULL);
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->blogs = _tmp4_;
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->blogs_length1 = _tmp4__length1;
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->_blogs_size_ = self->priv->blogs_length1;
+#line 3529 "TumblrPublishing.c"
+	{
+		GtkBuilder* _tmp5_;
+		GtkBuilder* _tmp6_;
+		GtkBuilder* _tmp7_;
+		GtkBuilder* _tmp8_;
+		GObject* _tmp9_;
+		GtkBox* _tmp10_;
+		GtkBuilder* _tmp11_;
+		GObject* _tmp12_;
+		GtkLabel* _tmp13_;
+		GtkBuilder* _tmp14_;
+		GObject* _tmp15_;
+		GtkButton* _tmp16_;
+		GtkBuilder* _tmp17_;
+		GObject* _tmp18_;
+		GtkButton* _tmp19_;
+		GtkBuilder* _tmp20_;
+		GObject* _tmp21_;
+		GtkComboBoxText* _tmp22_;
+		GtkBuilder* _tmp23_;
+		GObject* _tmp24_;
+		GtkLabel* _tmp25_;
+		GtkBuilder* _tmp26_;
+		GObject* _tmp27_;
+		GtkComboBoxText* _tmp28_;
+		GtkBuilder* _tmp29_;
+		GObject* _tmp30_;
+		GtkLabel* _tmp31_;
+		gchar* upload_label_text = NULL;
+		const gchar* _tmp32_;
+		gchar* _tmp33_;
+		GtkLabel* _tmp34_;
+		const gchar* _tmp35_;
+		GtkComboBoxText* _tmp36_;
+		GtkButton* _tmp40_;
+		GtkButton* _tmp41_;
+#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp5_ = gtk_builder_new ();
+#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_object_unref0 (self->priv->builder);
+#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		self->priv->builder = _tmp5_;
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp6_ = self->priv->builder;
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		gtk_builder_add_from_resource (_tmp6_, PLUGIN_RESOURCE_PATH "/tumblr_publishing_options_pane.ui", &_inner_error_);
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 3578 "TumblrPublishing.c"
+			goto __catch23_g_error;
+		}
+#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp7_ = self->priv->builder;
+#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		gtk_builder_connect_signals (_tmp7_, NULL);
+#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp8_ = self->priv->builder;
+#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp9_ = gtk_builder_get_object (_tmp8_, "tumblr_pane");
+#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_box_get_type (), GtkBox));
+#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_object_unref0 (self->priv->pane_widget);
+#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		self->priv->pane_widget = _tmp10_;
+#line 471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp11_ = self->priv->builder;
+#line 471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp12_ = gtk_builder_get_object (_tmp11_, "upload_info_label");
+#line 471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp13_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_label_get_type (), GtkLabel));
+#line 471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_object_unref0 (self->priv->upload_info_label);
+#line 471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		self->priv->upload_info_label = _tmp13_;
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp14_ = self->priv->builder;
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp15_ = gtk_builder_get_object (_tmp14_, "logout_button");
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp16_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_button_get_type (), GtkButton));
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_object_unref0 (self->priv->logout_button);
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		self->priv->logout_button = _tmp16_;
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp17_ = self->priv->builder;
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp18_ = gtk_builder_get_object (_tmp17_, "publish_button");
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_button_get_type (), GtkButton));
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_object_unref0 (self->priv->publish_button);
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		self->priv->publish_button = _tmp19_;
+#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp20_ = self->priv->builder;
+#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp21_ = gtk_builder_get_object (_tmp20_, "size_combo");
+#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_combo_box_text_get_type (), GtkComboBoxText));
+#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_object_unref0 (self->priv->size_combo);
+#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		self->priv->size_combo = _tmp22_;
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp23_ = self->priv->builder;
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp24_ = gtk_builder_get_object (_tmp23_, "size_label");
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_label_get_type (), GtkLabel));
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_object_unref0 (self->priv->size_label);
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		self->priv->size_label = _tmp25_;
+#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp26_ = self->priv->builder;
+#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp27_ = gtk_builder_get_object (_tmp26_, "blog_combo");
+#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_combo_box_text_get_type (), GtkComboBoxText));
+#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_object_unref0 (self->priv->blog_combo);
+#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		self->priv->blog_combo = _tmp28_;
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp29_ = self->priv->builder;
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp30_ = gtk_builder_get_object (_tmp29_, "blog_label");
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp31_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_label_get_type (), GtkLabel));
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_object_unref0 (self->priv->blog_label);
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		self->priv->blog_label = _tmp31_;
+#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp32_ = self->priv->username;
+#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp33_ = g_strdup_printf (_ ("You are logged into Tumblr as %s.\n\n"), _tmp32_);
+#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		upload_label_text = _tmp33_;
+#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp34_ = self->priv->upload_info_label;
+#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp35_ = upload_label_text;
+#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		gtk_label_set_label (_tmp34_, _tmp35_);
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_blog_combo (self);
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp36_ = self->priv->blog_combo;
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed_gtk_combo_box_changed, self, 0);
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		if (media_type != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+#line 3685 "TumblrPublishing.c"
+			GtkComboBoxText* _tmp37_;
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_size_combo (self);
+#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_tmp37_ = self->priv->size_combo;
+#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed_gtk_combo_box_changed, self, 0);
+#line 3693 "TumblrPublishing.c"
+		} else {
+			GtkComboBoxText* _tmp38_;
+			GtkLabel* _tmp39_;
+#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_tmp38_ = self->priv->size_combo;
+#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_tmp39_ = self->priv->size_label;
+#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 3705 "TumblrPublishing.c"
+		}
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp40_ = self->priv->logout_button;
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_signal_connect_object (_tmp40_, "clicked", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
+#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp41_ = self->priv->publish_button;
+#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_signal_connect_object (_tmp41_, "clicked", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_free0 (upload_label_text);
+#line 3717 "TumblrPublishing.c"
+	}
+	goto __finally23;
+	__catch23_g_error:
+	{
+		GError* e = NULL;
+		GError* _tmp42_;
+		const gchar* _tmp43_;
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		e = _inner_error_;
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_inner_error_ = NULL;
+#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp42_ = e;
+#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp43_ = _tmp42_->message;
+#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_warning (_ ("Could not load UI: %s"), _tmp43_);
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_error_free0 (e);
+#line 3737 "TumblrPublishing.c"
+	}
+	__finally23:
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.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 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_clear_error (&_inner_error_);
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		return NULL;
+#line 3748 "TumblrPublishing.c"
+	}
+#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return self;
+#line 3752 "TumblrPublishing.c"
+}
+
+
+PublishingTumblrTumblrPublisherPublishingOptionsPane*
+publishing_tumblr_tumblr_publisher_publishing_options_pane_new (PublishingTumblrTumblrPublisher* publisher,
+                                                                SpitPublishingPublisherMediaType media_type,
+                                                                PublishingTumblrSizeEntry** sizes,
+                                                                int sizes_length1,
+                                                                PublishingTumblrBlogEntry** blogs,
+                                                                int blogs_length1,
+                                                                const gchar* username)
+{
+#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return publishing_tumblr_tumblr_publisher_publishing_options_pane_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, publisher, media_type, sizes, sizes_length1, blogs, blogs_length1, username);
+#line 3767 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked (PublishingTumblrTumblrPublisherPublishingOptionsPane* self)
+{
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_emit (self, publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
+#line 3778 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked (PublishingTumblrTumblrPublisherPublishingOptionsPane* self)
+{
+#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
+#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_emit (self, publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0);
+#line 3789 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_blog_combo (PublishingTumblrTumblrPublisherPublishingOptionsPane* self)
+{
+	PublishingTumblrBlogEntry** _tmp0_;
+	gint _tmp0__length1;
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
+#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->blogs;
+#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0__length1 = self->priv->blogs_length1;
+#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (_tmp0_ != NULL) {
+#line 3806 "TumblrPublishing.c"
+		PublishingTumblrBlogEntry** _tmp1_;
+		gint _tmp1__length1;
+		GtkComboBoxText* _tmp6_;
+		PublishingTumblrTumblrPublisher* _tmp7_;
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp1_ = self->priv->blogs;
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp1__length1 = self->priv->blogs_length1;
+#line 3815 "TumblrPublishing.c"
+		{
+			PublishingTumblrBlogEntry** b_collection = NULL;
+			gint b_collection_length1 = 0;
+			gint _b_collection_size_ = 0;
+			gint b_it = 0;
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			b_collection = _tmp1_;
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			b_collection_length1 = _tmp1__length1;
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			for (b_it = 0; b_it < _tmp1__length1; b_it = b_it + 1) {
+#line 3827 "TumblrPublishing.c"
+				PublishingTumblrBlogEntry* _tmp2_;
+				PublishingTumblrBlogEntry* b = NULL;
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+				_tmp2_ = _publishing_tumblr_blog_entry_ref0 (b_collection[b_it]);
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+				b = _tmp2_;
+#line 3834 "TumblrPublishing.c"
+				{
+					GtkComboBoxText* _tmp3_;
+					PublishingTumblrBlogEntry* _tmp4_;
+					const gchar* _tmp5_;
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp3_ = self->priv->blog_combo;
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp4_ = b;
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp5_ = _tmp4_->blog;
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					gtk_combo_box_text_append_text (_tmp3_, _tmp5_);
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_publishing_tumblr_blog_entry_unref0 (b);
+#line 3849 "TumblrPublishing.c"
+				}
+			}
+		}
+#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp6_ = self->priv->blog_combo;
+#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp7_ = self->priv->publisher;
+#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), publishing_tumblr_tumblr_publisher_get_persistent_default_blog (_tmp7_));
+#line 3859 "TumblrPublishing.c"
+	}
+}
+
+
+static void
+publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed (PublishingTumblrTumblrPublisherPublishingOptionsPane* self)
+{
+	PublishingTumblrTumblrPublisher* _tmp0_;
+	GtkComboBoxText* _tmp1_;
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
+#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->publisher;
+#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = self->priv->blog_combo;
+#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_set_persistent_default_blog (_tmp0_, gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)));
+#line 3877 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_size_combo (PublishingTumblrTumblrPublisherPublishingOptionsPane* self)
+{
+	PublishingTumblrSizeEntry** _tmp0_;
+	gint _tmp0__length1;
+#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->sizes;
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0__length1 = self->priv->sizes_length1;
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (_tmp0_ != NULL) {
+#line 3894 "TumblrPublishing.c"
+		PublishingTumblrSizeEntry** _tmp1_;
+		gint _tmp1__length1;
+		GtkComboBoxText* _tmp6_;
+		PublishingTumblrTumblrPublisher* _tmp7_;
+#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp1_ = self->priv->sizes;
+#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp1__length1 = self->priv->sizes_length1;
+#line 3903 "TumblrPublishing.c"
+		{
+			PublishingTumblrSizeEntry** e_collection = NULL;
+			gint e_collection_length1 = 0;
+			gint _e_collection_size_ = 0;
+			gint e_it = 0;
+#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			e_collection = _tmp1_;
+#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			e_collection_length1 = _tmp1__length1;
+#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			for (e_it = 0; e_it < _tmp1__length1; e_it = e_it + 1) {
+#line 3915 "TumblrPublishing.c"
+				PublishingTumblrSizeEntry* _tmp2_;
+				PublishingTumblrSizeEntry* e = NULL;
+#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+				_tmp2_ = _publishing_tumblr_size_entry_ref0 (e_collection[e_it]);
+#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+				e = _tmp2_;
+#line 3922 "TumblrPublishing.c"
+				{
+					GtkComboBoxText* _tmp3_;
+					PublishingTumblrSizeEntry* _tmp4_;
+					const gchar* _tmp5_;
+#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp3_ = self->priv->size_combo;
+#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp4_ = e;
+#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp5_ = _tmp4_->title;
+#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					gtk_combo_box_text_append_text (_tmp3_, _tmp5_);
+#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_publishing_tumblr_size_entry_unref0 (e);
+#line 3937 "TumblrPublishing.c"
+				}
+			}
+		}
+#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp6_ = self->priv->size_combo;
+#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp7_ = self->priv->publisher;
+#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), publishing_tumblr_tumblr_publisher_get_persistent_default_size (_tmp7_));
+#line 3947 "TumblrPublishing.c"
+	}
+}
+
+
+static void
+publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed (PublishingTumblrTumblrPublisherPublishingOptionsPane* self)
+{
+	PublishingTumblrTumblrPublisher* _tmp0_;
+	GtkComboBoxText* _tmp1_;
+#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
+#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->publisher;
+#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = self->priv->size_combo;
+#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_set_persistent_default_size (_tmp0_, gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)));
+#line 3965 "TumblrPublishing.c"
+}
+
+
+void
+publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* self)
+{
+#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
+#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_emit (self, publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0);
+#line 3976 "TumblrPublishing.c"
+}
+
+
+void
+publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* self)
+{
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_emit (self, publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
+#line 3987 "TumblrPublishing.c"
+}
+
+
+static GtkWidget*
+publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base)
+{
+	PublishingTumblrTumblrPublisherPublishingOptionsPane * self;
+	GtkWidget* result = NULL;
+	GtkBox* _tmp0_;
+	GtkWidget* _tmp1_;
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane);
+#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->pane_widget;
+#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
+#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	result = _tmp1_;
+#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 4008 "TumblrPublishing.c"
+}
+
+
+static SpitPublishingDialogPaneGeometryOptions
+publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base)
+{
+	PublishingTumblrTumblrPublisherPublishingOptionsPane * self;
+	SpitPublishingDialogPaneGeometryOptions result = 0;
+#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane);
+#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
+#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 4023 "TumblrPublishing.c"
+}
+
+
+static void
+_publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender,
+                                                                                                                                               gpointer self)
+{
+#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
+#line 4033 "TumblrPublishing.c"
+}
+
+
+static void
+_publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender,
+                                                                                                                                             gpointer self)
+{
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
+#line 4043 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base)
+{
+	PublishingTumblrTumblrPublisherPublishingOptionsPane * self;
+#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane);
+#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_connect_object (self, "publish", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish, self, 0);
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_connect_object (self, "logout", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout, self, 0);
+#line 4057 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base)
+{
+	PublishingTumblrTumblrPublisherPublishingOptionsPane * self;
+	guint _tmp0_;
+	guint _tmp1_;
+#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane);
+#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_parse_name ("publish", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp0_, NULL, FALSE);
+#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish, self);
+#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_parse_name ("logout", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE);
+#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout, self);
+#line 4077 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_tumblr_publisher_publishing_options_pane_class_init (PublishingTumblrTumblrPublisherPublishingOptionsPaneClass * klass)
+{
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_publishing_options_pane_parent_class = g_type_class_peek_parent (klass);
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherPublishingOptionsPanePrivate));
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	G_OBJECT_CLASS (klass)->finalize = publishing_tumblr_tumblr_publisher_publishing_options_pane_finalize;
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL] = g_signal_new ("publish", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL] = g_signal_new ("logout", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 4094 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_tumblr_publisher_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface)
+{
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_widget;
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_preferred_geometry;
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_installed;
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_uninstalled;
+#line 4111 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_tumblr_publisher_publishing_options_pane_instance_init (PublishingTumblrTumblrPublisherPublishingOptionsPane * self)
+{
+	gchar* _tmp0_;
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
+#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->pane_widget = NULL;
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->upload_info_label = NULL;
+#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->size_label = NULL;
+#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->blog_label = NULL;
+#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->logout_button = NULL;
+#line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->publish_button = NULL;
+#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->size_combo = NULL;
+#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->blog_combo = NULL;
+#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->sizes = NULL;
+#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->sizes_length1 = 0;
+#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->_sizes_size_ = self->priv->sizes_length1;
+#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->blogs = NULL;
+#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->blogs_length1 = 0;
+#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->_blogs_size_ = self->priv->blogs_length1;
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = g_strdup ("");
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->username = _tmp0_;
+#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->publisher = NULL;
+#line 4155 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_tumblr_publisher_publishing_options_pane_finalize (GObject * obj)
+{
+	PublishingTumblrTumblrPublisherPublishingOptionsPane * self;
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane);
+#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (self->priv->builder);
+#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (self->priv->pane_widget);
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (self->priv->upload_info_label);
+#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (self->priv->size_label);
+#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (self->priv->blog_label);
+#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (self->priv->logout_button);
+#line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (self->priv->publish_button);
+#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (self->priv->size_combo);
+#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (self->priv->blog_combo);
+#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->sizes = (_vala_array_free (self->priv->sizes, self->priv->sizes_length1, (GDestroyNotify) publishing_tumblr_size_entry_unref), NULL);
+#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->blogs = (_vala_array_free (self->priv->blogs, self->priv->blogs_length1, (GDestroyNotify) publishing_tumblr_blog_entry_unref), NULL);
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 (self->priv->username);
+#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (self->priv->publisher);
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	G_OBJECT_CLASS (publishing_tumblr_tumblr_publisher_publishing_options_pane_parent_class)->finalize (obj);
+#line 4193 "TumblrPublishing.c"
+}
+
+
+/**
+         * The publishing options pane.
+         */
+GType
+publishing_tumblr_tumblr_publisher_publishing_options_pane_get_type (void)
+{
+	static volatile gsize publishing_tumblr_tumblr_publisher_publishing_options_pane_type_id__volatile = 0;
+	if (g_once_init_enter (&publishing_tumblr_tumblr_publisher_publishing_options_pane_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (PublishingTumblrTumblrPublisherPublishingOptionsPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_tumblr_tumblr_publisher_publishing_options_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingTumblrTumblrPublisherPublishingOptionsPane), 0, (GInstanceInitFunc) publishing_tumblr_tumblr_publisher_publishing_options_pane_instance_init, NULL };
+		static const GInterfaceInfo spit_publishing_dialog_pane_info = { (GInterfaceInitFunc) publishing_tumblr_tumblr_publisher_publishing_options_pane_spit_publishing_dialog_pane_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
+		GType publishing_tumblr_tumblr_publisher_publishing_options_pane_type_id;
+		publishing_tumblr_tumblr_publisher_publishing_options_pane_type_id = g_type_register_static (G_TYPE_OBJECT, "PublishingTumblrTumblrPublisherPublishingOptionsPane", &g_define_type_info, 0);
+		g_type_add_interface_static (publishing_tumblr_tumblr_publisher_publishing_options_pane_type_id, SPIT_PUBLISHING_TYPE_DIALOG_PANE, &spit_publishing_dialog_pane_info);
+		g_once_init_leave (&publishing_tumblr_tumblr_publisher_publishing_options_pane_type_id__volatile, publishing_tumblr_tumblr_publisher_publishing_options_pane_type_id);
+	}
+	return publishing_tumblr_tumblr_publisher_publishing_options_pane_type_id__volatile;
+}
+
+
+PublishingTumblrTumblrPublisherUserInfoFetchTransaction*
+publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_construct (GType object_type,
+                                                                          PublishingRESTSupportOAuth1Session* session)
+{
+	PublishingTumblrTumblrPublisherUserInfoFetchTransaction* self = NULL;
+#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (session), NULL);
+#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = (PublishingTumblrTumblrPublisherUserInfoFetchTransaction*) publishing_rest_support_oauth1_transaction_construct_with_uri (object_type, session, "https://api.tumblr.com/v2/user/info", PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return self;
+#line 4227 "TumblrPublishing.c"
+}
+
+
+PublishingTumblrTumblrPublisherUserInfoFetchTransaction*
+publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_new (PublishingRESTSupportOAuth1Session* session)
+{
+#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_USER_INFO_FETCH_TRANSACTION, session);
+#line 4236 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_class_init (PublishingTumblrTumblrPublisherUserInfoFetchTransactionClass * klass)
+{
+#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_parent_class = g_type_class_peek_parent (klass);
+#line 4245 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_instance_init (PublishingTumblrTumblrPublisherUserInfoFetchTransaction * self)
+{
+}
+
+
+GType
+publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_get_type (void)
+{
+	static volatile gsize publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_type_id__volatile = 0;
+	if (g_once_init_enter (&publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (PublishingTumblrTumblrPublisherUserInfoFetchTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingTumblrTumblrPublisherUserInfoFetchTransaction), 0, (GInstanceInitFunc) publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_instance_init, NULL };
+		GType publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_type_id;
+		publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_TRANSACTION, "PublishingTumblrTumblrPublisherUserInfoFetchTransaction", &g_define_type_info, 0);
+		g_once_init_leave (&publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_type_id__volatile, publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_type_id);
+	}
+	return publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_type_id__volatile;
+}
+
+
+static gchar*
+publishing_tumblr_tumblr_publisher_upload_transaction_encode (PublishingTumblrTumblrPublisherUploadTransaction* self,
+                                                              guint8* data,
+                                                              int data_length1)
+{
+	gchar* result = NULL;
+	GString* s = NULL;
+	GString* _tmp0_;
+	gchar* bytes = NULL;
+	gchar* _tmp1_;
+	gint bytes_length1;
+	gint _bytes_size_;
+	gchar* _tmp2_;
+	gint _tmp2__length1;
+	gchar _tmp3_;
+	GString* _tmp13_;
+	const gchar* _tmp14_;
+	gchar* _tmp15_;
+#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOAD_TRANSACTION (self), NULL);
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = g_string_new ("");
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	s = _tmp0_;
+#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = g_new0 (gchar, 2);
+#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	bytes = _tmp1_;
+#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	bytes_length1 = 2;
+#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_bytes_size_ = bytes_length1;
+#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2_ = bytes;
+#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2__length1 = bytes_length1;
+#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2_[1] = (gchar) 0;
+#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp3_ = _tmp2_[1];
+#line 4309 "TumblrPublishing.c"
+	{
+		guint8* byte_collection = NULL;
+		gint byte_collection_length1 = 0;
+		gint _byte_collection_size_ = 0;
+		gint byte_it = 0;
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		byte_collection = data;
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		byte_collection_length1 = data_length1;
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		for (byte_it = 0; byte_it < data_length1; byte_it = byte_it + 1) {
+#line 4321 "TumblrPublishing.c"
+			guint8 byte = 0U;
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			byte = byte_collection[byte_it];
+#line 4325 "TumblrPublishing.c"
+			{
+				guint8 _tmp4_;
+#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+				_tmp4_ = byte;
+#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+				if (((gint) _tmp4_) == 0) {
+#line 4332 "TumblrPublishing.c"
+					GString* _tmp5_;
+#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp5_ = s;
+#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					g_string_append (_tmp5_, "%00");
+#line 4338 "TumblrPublishing.c"
+				} else {
+					gchar* _tmp6_;
+					gint _tmp6__length1;
+					guint8 _tmp7_;
+					gchar _tmp8_;
+					GString* _tmp9_;
+					gchar* _tmp10_;
+					gint _tmp10__length1;
+					gchar* _tmp11_;
+					gchar* _tmp12_;
+#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp6_ = bytes;
+#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp6__length1 = bytes_length1;
+#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp7_ = byte;
+#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp6_[0] = (gchar) _tmp7_;
+#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp8_ = _tmp6_[0];
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp9_ = s;
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp10_ = bytes;
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp10__length1 = bytes_length1;
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp11_ = soup_uri_encode ((const gchar*) _tmp10_, PUBLISHING_TUMBLR_ENCODE_RFC_3986_EXTRA);
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp12_ = _tmp11_;
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					g_string_append (_tmp9_, _tmp12_);
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_g_free0 (_tmp12_);
+#line 4373 "TumblrPublishing.c"
+				}
+			}
+		}
+	}
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp13_ = s;
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp14_ = _tmp13_->str;
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp15_ = g_strdup (_tmp14_);
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	result = _tmp15_;
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	bytes = (g_free (bytes), NULL);
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_string_free0 (s);
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 4392 "TumblrPublishing.c"
+}
+
+
+PublishingTumblrTumblrPublisherUploadTransaction*
+publishing_tumblr_tumblr_publisher_upload_transaction_construct (GType object_type,
+                                                                 PublishingRESTSupportOAuth1Session* session,
+                                                                 SpitPublishingPublishable* publishable,
+                                                                 const gchar* blog_url)
+{
+	PublishingTumblrTumblrPublisherUploadTransaction* self = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (session), NULL);
+#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
+#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (blog_url != NULL, NULL);
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:596: Init upload transaction");
+#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = g_strdup_printf ("https://api.tumblr.com/v2/blog/%s/post", blog_url);
+#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = _tmp0_;
+#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = (PublishingTumblrTumblrPublisherUploadTransaction*) publishing_rest_support_oauth1_upload_transaction_construct (object_type, session, publishable, _tmp1_);
+#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 (_tmp1_);
+#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return self;
+#line 4423 "TumblrPublishing.c"
+}
+
+
+PublishingTumblrTumblrPublisherUploadTransaction*
+publishing_tumblr_tumblr_publisher_upload_transaction_new (PublishingRESTSupportOAuth1Session* session,
+                                                           SpitPublishingPublishable* publishable,
+                                                           const gchar* blog_url)
+{
+#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return publishing_tumblr_tumblr_publisher_upload_transaction_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION, session, publishable, blog_url);
+#line 4434 "TumblrPublishing.c"
+}
+
+
+static guint8*
+string_get_data (const gchar* self,
+                 int* result_length1)
+{
+	guint8* result;
+	guint8* res = NULL;
+	gint res_length1;
+	gint _res_size_;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	guint8* _tmp3_;
+	gint _tmp3__length1;
+	guint8* _tmp4_;
+	gint _tmp4__length1;
+#line 1442 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (self != NULL, NULL);
+#line 1443 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	res = (guint8*) self;
+#line 1443 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	res_length1 = -1;
+#line 1443 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_res_size_ = res_length1;
+#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp0_ = strlen (self);
+#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp1_ = _tmp0_;
+#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	res_length1 = (gint) _tmp1_;
+#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp2_ = res_length1;
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp3_ = res;
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp3__length1 = res_length1;
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp4_ = _tmp3_;
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp4__length1 = _tmp3__length1;
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (result_length1) {
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		*result_length1 = _tmp4__length1;
+#line 4481 "TumblrPublishing.c"
+	}
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	result = _tmp4_;
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	return result;
+#line 4487 "TumblrPublishing.c"
+}
+
+
+static gchar*
+_vala_g_strjoinv (const gchar* separator,
+                  gchar** str_array,
+                  int str_array_length1)
+{
+	gchar* result = NULL;
+	gboolean _tmp0_ = FALSE;
+#line 1092 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (separator == NULL) {
+#line 1093 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		separator = "";
+#line 4502 "TumblrPublishing.c"
+	}
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (str_array != NULL) {
+#line 4506 "TumblrPublishing.c"
+		gboolean _tmp1_ = FALSE;
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		if (str_array_length1 > 0) {
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+			_tmp1_ = TRUE;
+#line 4512 "TumblrPublishing.c"
+		} else {
+			gboolean _tmp2_ = FALSE;
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+			if (str_array_length1 == -1) {
+#line 4517 "TumblrPublishing.c"
+				const gchar* _tmp3_;
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp3_ = str_array[0];
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp2_ = _tmp3_ != NULL;
+#line 4523 "TumblrPublishing.c"
+			} else {
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp2_ = FALSE;
+#line 4527 "TumblrPublishing.c"
+			}
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+			_tmp1_ = _tmp2_;
+#line 4531 "TumblrPublishing.c"
+		}
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp0_ = _tmp1_;
+#line 4535 "TumblrPublishing.c"
+	} else {
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp0_ = FALSE;
+#line 4539 "TumblrPublishing.c"
+	}
+#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (_tmp0_) {
+#line 4543 "TumblrPublishing.c"
+		gint i = 0;
+		gsize len = 0UL;
+		gint _tmp20_;
+		gint _tmp22_;
+		gint _tmp23_;
+		gsize _tmp24_;
+		gint _tmp25_;
+		gint _tmp26_;
+		gint _tmp27_;
+		const gchar* res = NULL;
+		gsize _tmp28_;
+		void* _tmp29_;
+		void* ptr = NULL;
+		const gchar* _tmp30_;
+		const gchar* _tmp31_;
+		void* _tmp32_;
+		const gchar* _tmp45_;
+#line 1097 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		len = (gsize) 1;
+#line 4563 "TumblrPublishing.c"
+		{
+			gboolean _tmp4_ = FALSE;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+			i = 0;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+			_tmp4_ = TRUE;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+			while (TRUE) {
+#line 4572 "TumblrPublishing.c"
+				gboolean _tmp6_ = FALSE;
+				gboolean _tmp7_ = FALSE;
+				gint _tmp12_ = 0;
+				gint _tmp13_;
+				const gchar* _tmp14_;
+				gsize _tmp19_;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				if (!_tmp4_) {
+#line 4581 "TumblrPublishing.c"
+					gint _tmp5_;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp5_ = i;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					i = _tmp5_ + 1;
+#line 4587 "TumblrPublishing.c"
+				}
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp4_ = FALSE;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				if (str_array_length1 != -1) {
+#line 4593 "TumblrPublishing.c"
+					gint _tmp8_;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp8_ = i;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp7_ = _tmp8_ < str_array_length1;
+#line 4599 "TumblrPublishing.c"
+				} else {
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp7_ = FALSE;
+#line 4603 "TumblrPublishing.c"
+				}
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				if (_tmp7_) {
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp6_ = TRUE;
+#line 4609 "TumblrPublishing.c"
+				} else {
+					gboolean _tmp9_ = FALSE;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					if (str_array_length1 == -1) {
+#line 4614 "TumblrPublishing.c"
+						gint _tmp10_;
+						const gchar* _tmp11_;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+						_tmp10_ = i;
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+						_tmp11_ = str_array[_tmp10_];
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+						_tmp9_ = _tmp11_ != NULL;
+#line 4623 "TumblrPublishing.c"
+					} else {
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+						_tmp9_ = FALSE;
+#line 4627 "TumblrPublishing.c"
+					}
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp6_ = _tmp9_;
+#line 4631 "TumblrPublishing.c"
+				}
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				if (!_tmp6_) {
+#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					break;
+#line 4637 "TumblrPublishing.c"
+				}
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp13_ = i;
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp14_ = str_array[_tmp13_];
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				if (_tmp14_ != NULL) {
+#line 4645 "TumblrPublishing.c"
+					gint _tmp15_;
+					const gchar* _tmp16_;
+					gint _tmp17_;
+					gint _tmp18_;
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp15_ = i;
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp16_ = str_array[_tmp15_];
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp17_ = strlen ((const gchar*) _tmp16_);
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp18_ = _tmp17_;
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp12_ = _tmp18_;
+#line 4660 "TumblrPublishing.c"
+				} else {
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp12_ = 0;
+#line 4664 "TumblrPublishing.c"
+				}
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp19_ = len;
+#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				len = _tmp19_ + _tmp12_;
+#line 4670 "TumblrPublishing.c"
+			}
+		}
+#line 1101 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp20_ = i;
+#line 1101 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		if (_tmp20_ == 0) {
+#line 4677 "TumblrPublishing.c"
+			gchar* _tmp21_;
+#line 1102 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+			_tmp21_ = g_strdup ("");
+#line 1102 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+			result = _tmp21_;
+#line 1102 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+			return result;
+#line 4685 "TumblrPublishing.c"
+		}
+#line 1104 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp22_ = i;
+#line 1104 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		str_array_length1 = _tmp22_;
+#line 1104 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp23_ = str_array_length1;
+#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp24_ = len;
+#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp25_ = strlen ((const gchar*) separator);
+#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp26_ = _tmp25_;
+#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp27_ = i;
+#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		len = _tmp24_ + (_tmp26_ * (_tmp27_ - 1));
+#line 1107 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp28_ = len;
+#line 1107 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp29_ = g_malloc (_tmp28_);
+#line 1107 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		res = _tmp29_;
+#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp30_ = res;
+#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp31_ = str_array[0];
+#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp32_ = g_stpcpy ((void*) _tmp30_, (const gchar*) _tmp31_);
+#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		ptr = _tmp32_;
+#line 4717 "TumblrPublishing.c"
+		{
+			gboolean _tmp33_ = FALSE;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+			i = 1;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+			_tmp33_ = TRUE;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+			while (TRUE) {
+#line 4726 "TumblrPublishing.c"
+				gint _tmp35_;
+				void* _tmp36_;
+				void* _tmp37_;
+				const gchar* _tmp38_ = NULL;
+				gint _tmp39_;
+				const gchar* _tmp40_;
+				void* _tmp43_;
+				void* _tmp44_;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				if (!_tmp33_) {
+#line 4737 "TumblrPublishing.c"
+					gint _tmp34_;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp34_ = i;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					i = _tmp34_ + 1;
+#line 4743 "TumblrPublishing.c"
+				}
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp33_ = FALSE;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp35_ = i;
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				if (!(_tmp35_ < str_array_length1)) {
+#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					break;
+#line 4753 "TumblrPublishing.c"
+				}
+#line 1110 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp36_ = ptr;
+#line 1110 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp37_ = g_stpcpy (_tmp36_, (const gchar*) separator);
+#line 1110 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				ptr = _tmp37_;
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp39_ = i;
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp40_ = str_array[_tmp39_];
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				if (_tmp40_ != NULL) {
+#line 4767 "TumblrPublishing.c"
+					gint _tmp41_;
+					const gchar* _tmp42_;
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp41_ = i;
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp42_ = str_array[_tmp41_];
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp38_ = (const gchar*) _tmp42_;
+#line 4776 "TumblrPublishing.c"
+				} else {
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+					_tmp38_ = "";
+#line 4780 "TumblrPublishing.c"
+				}
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp43_ = ptr;
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				_tmp44_ = g_stpcpy (_tmp43_, _tmp38_);
+#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+				ptr = _tmp44_;
+#line 4788 "TumblrPublishing.c"
+			}
+		}
+#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp45_ = res;
+#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		res = NULL;
+#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		result = (gchar*) _tmp45_;
+#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		return result;
+#line 4799 "TumblrPublishing.c"
+	} else {
+		gchar* _tmp46_;
+#line 1116 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp46_ = g_strdup ("");
+#line 1116 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		result = _tmp46_;
+#line 1116 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		return result;
+#line 4808 "TumblrPublishing.c"
+	}
+}
+
+
+static void
+publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (PublishingRESTSupportTransaction* base,
+                                                                    GError** error)
+{
+	PublishingTumblrTumblrPublisherUploadTransaction * self;
+	gchar* payload = NULL;
+	gsize payload_length = 0UL;
+	PublishingRESTSupportArgument** request_arguments = NULL;
+	gint _tmp24_;
+	PublishingRESTSupportArgument** _tmp25_;
+	gint request_arguments_length1;
+	gint _request_arguments_size_;
+	PublishingRESTSupportArgument** _tmp26_;
+	gint _tmp26__length1;
+	gchar* request_data = NULL;
+	PublishingRESTSupportArgument** _tmp27_;
+	gint _tmp27__length1;
+	gchar* _tmp28_;
+	SoupMessage* outbound_message = NULL;
+	gchar* _tmp29_;
+	gchar* _tmp30_;
+	SoupMessage* _tmp31_;
+	SoupMessage* _tmp32_;
+	SoupMessage* _tmp33_;
+	const gchar* _tmp34_;
+	guint8* _tmp35_;
+	gint _tmp35__length1;
+	guint8* _tmp36_;
+	gint _tmp36__length1;
+	GeeMapIterator* i = NULL;
+	GeeHashMap* _tmp37_;
+	GeeMapIterator* _tmp38_;
+	gboolean cont = FALSE;
+	GeeMapIterator* _tmp39_;
+	SoupMessage* _tmp50_;
+	GError * _inner_error_ = NULL;
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION, PublishingTumblrTumblrPublisherUploadTransaction);
+#line 4851 "TumblrPublishing.c"
+	{
+		SpitPublishingPublishable* _tmp0_;
+		GFile* _tmp1_;
+		GFile* _tmp2_;
+		gchar* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_ = NULL;
+		gsize _tmp6_ = 0UL;
+		gchar* reqdata = NULL;
+		const gchar* _tmp7_;
+		guint8* _tmp8_;
+		gint _tmp8__length1;
+		guint8* _tmp9_;
+		gint _tmp9__length1;
+		gsize _tmp10_;
+		gchar* _tmp11_;
+		const gchar* _tmp12_;
+		gchar** keywords = NULL;
+		SpitPublishingPublishable* _tmp13_;
+		gint _tmp14_;
+		gchar** _tmp15_;
+		gint keywords_length1;
+		gint _keywords_size_;
+		gchar* tags = NULL;
+		gchar* _tmp16_;
+		gchar** _tmp17_;
+		gint _tmp17__length1;
+		const gchar* _tmp20_;
+		gchar* _tmp21_;
+		gchar* _tmp22_;
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportOAuth1UploadTransaction), PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction)->publishable;
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp1_ = spit_publishing_publishable_get_serialized_file (_tmp0_);
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp2_ = _tmp1_;
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp3_ = g_file_get_path (_tmp2_);
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp4_ = _tmp3_;
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_file_get_contents (_tmp4_, &_tmp5_, &_tmp6_, &_inner_error_);
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_free0 (payload);
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		payload = _tmp5_;
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		payload_length = _tmp6_;
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_free0 (_tmp4_);
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_object_unref0 (_tmp2_);
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			if (_inner_error_->domain == G_FILE_ERROR) {
+#line 4908 "TumblrPublishing.c"
+				goto __catch24_g_file_error;
+			}
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_g_free0 (payload);
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.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 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			g_clear_error (&_inner_error_);
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			return;
+#line 4919 "TumblrPublishing.c"
+		}
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp7_ = payload;
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp8_ = string_get_data (_tmp7_, &_tmp8__length1);
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp9_ = _tmp8_;
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp9__length1 = _tmp8__length1;
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp10_ = payload_length;
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp11_ = publishing_tumblr_tumblr_publisher_upload_transaction_encode (self, _tmp9_ + 0, ((gint) _tmp10_) - 0);
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		reqdata = _tmp11_;
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp12_ = reqdata;
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "data[0]", _tmp12_);
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "type", "photo");
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportOAuth1UploadTransaction), PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction)->publishable;
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp15_ = spit_publishing_publishable_get_publishing_keywords (_tmp13_, &_tmp14_);
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		keywords = _tmp15_;
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		keywords_length1 = _tmp14_;
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_keywords_size_ = keywords_length1;
+#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp16_ = g_strdup ("");
+#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		tags = _tmp16_;
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp17_ = keywords;
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp17__length1 = keywords_length1;
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		if (_tmp17_ != NULL) {
+#line 4961 "TumblrPublishing.c"
+			gchar** _tmp18_;
+			gint _tmp18__length1;
+			gchar* _tmp19_;
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_tmp18_ = keywords;
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_tmp18__length1 = keywords_length1;
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_tmp19_ = _vala_g_strjoinv (",", _tmp18_, _tmp18__length1);
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_g_free0 (tags);
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			tags = _tmp19_;
+#line 4975 "TumblrPublishing.c"
+		}
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp20_ = tags;
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp21_ = soup_uri_encode (_tmp20_, PUBLISHING_TUMBLR_ENCODE_RFC_3986_EXTRA);
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp22_ = _tmp21_;
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "tags", _tmp22_);
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_free0 (_tmp22_);
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_free0 (tags);
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL);
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_free0 (reqdata);
+#line 4993 "TumblrPublishing.c"
+	}
+	goto __finally24;
+	__catch24_g_file_error:
+	{
+		GError* e = NULL;
+		GError* _tmp23_;
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		e = _inner_error_;
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_inner_error_ = NULL;
+#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp23_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _ ("A temporary file needed for publishing is unavailable"));
+#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_inner_error_ = _tmp23_;
+#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_error_free0 (e);
+#line 5010 "TumblrPublishing.c"
+		goto __finally24;
+	}
+	__finally24:
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			g_propagate_error (error, _inner_error_);
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_g_free0 (payload);
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			return;
+#line 5024 "TumblrPublishing.c"
+		} else {
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_g_free0 (payload);
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.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 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			g_clear_error (&_inner_error_);
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			return;
+#line 5034 "TumblrPublishing.c"
+		}
+	}
+#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_rest_support_oauth1_upload_transaction_authorize (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportOAuth1UploadTransaction));
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp25_ = publishing_rest_support_transaction_get_arguments (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_tmp24_);
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	request_arguments = _tmp25_;
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	request_arguments_length1 = _tmp24_;
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_request_arguments_size_ = request_arguments_length1;
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp26_ = request_arguments;
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp26__length1 = request_arguments_length1;
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_vala_assert (_tmp26__length1 > 0, "request_arguments.length > 0");
+#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp27_ = request_arguments;
+#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp27__length1 = request_arguments_length1;
+#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp28_ = publishing_rest_support_argument_serialize_list (_tmp27_, _tmp27__length1, FALSE, "&");
+#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	request_data = _tmp28_;
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp29_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp30_ = _tmp29_;
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp31_ = soup_message_new ("POST", _tmp30_);
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp32_ = _tmp31_;
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 (_tmp30_);
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	outbound_message = _tmp32_;
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp33_ = outbound_message;
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp34_ = request_data;
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp35_ = string_get_data (_tmp34_, &_tmp35__length1);
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp36_ = _tmp35_;
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp36__length1 = _tmp35__length1;
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	soup_message_set_request (_tmp33_, "application/x-www-form-urlencoded", SOUP_MEMORY_COPY, _tmp36_, (gsize) _tmp36__length1);
+#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp37_ = G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportOAuth1UploadTransaction), PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction)->message_headers;
+#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp38_ = gee_abstract_map_map_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
+#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	i = _tmp38_;
+#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp39_ = i;
+#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	cont = gee_map_iterator_next (_tmp39_);
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	while (TRUE) {
+#line 5097 "TumblrPublishing.c"
+		gboolean _tmp40_;
+		SoupMessage* _tmp41_;
+		SoupMessageHeaders* _tmp42_;
+		GeeMapIterator* _tmp43_;
+		gpointer _tmp44_;
+		gchar* _tmp45_;
+		GeeMapIterator* _tmp46_;
+		gpointer _tmp47_;
+		gchar* _tmp48_;
+		GeeMapIterator* _tmp49_;
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp40_ = cont;
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		if (!_tmp40_) {
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			break;
+#line 5114 "TumblrPublishing.c"
+		}
+#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp41_ = outbound_message;
+#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp42_ = _tmp41_->request_headers;
+#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp43_ = i;
+#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp44_ = gee_map_iterator_get_key (_tmp43_);
+#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp45_ = (gchar*) _tmp44_;
+#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp46_ = i;
+#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp47_ = gee_map_iterator_get_value (_tmp46_);
+#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp48_ = (gchar*) _tmp47_;
+#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		soup_message_headers_append (_tmp42_, _tmp45_, _tmp48_);
+#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_free0 (_tmp48_);
+#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_free0 (_tmp45_);
+#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp49_ = i;
+#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		cont = gee_map_iterator_next (_tmp49_);
+#line 5142 "TumblrPublishing.c"
+	}
+#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp50_ = outbound_message;
+#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp50_);
+#line 646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_rest_support_transaction_set_is_executed (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), TRUE);
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_rest_support_transaction_send (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			g_propagate_error (error, _inner_error_);
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_g_object_unref0 (i);
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_g_object_unref0 (outbound_message);
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_g_free0 (request_data);
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_g_free0 (payload);
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			return;
+#line 5170 "TumblrPublishing.c"
+		} else {
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_g_object_unref0 (i);
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_g_object_unref0 (outbound_message);
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_g_free0 (request_data);
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_g_free0 (payload);
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.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 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			g_clear_error (&_inner_error_);
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			return;
+#line 5188 "TumblrPublishing.c"
+		}
+	}
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (i);
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (outbound_message);
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 (request_data);
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 (payload);
+#line 5201 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_tumblr_publisher_upload_transaction_class_init (PublishingTumblrTumblrPublisherUploadTransactionClass * klass)
+{
+#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_upload_transaction_parent_class = g_type_class_peek_parent (klass);
+#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_tumblr_tumblr_publisher_upload_transaction_real_execute;
+#line 5212 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_tumblr_publisher_upload_transaction_instance_init (PublishingTumblrTumblrPublisherUploadTransaction * self)
+{
+}
+
+
+GType
+publishing_tumblr_tumblr_publisher_upload_transaction_get_type (void)
+{
+	static volatile gsize publishing_tumblr_tumblr_publisher_upload_transaction_type_id__volatile = 0;
+	if (g_once_init_enter (&publishing_tumblr_tumblr_publisher_upload_transaction_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (PublishingTumblrTumblrPublisherUploadTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_tumblr_tumblr_publisher_upload_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingTumblrTumblrPublisherUploadTransaction), 0, (GInstanceInitFunc) publishing_tumblr_tumblr_publisher_upload_transaction_instance_init, NULL };
+		GType publishing_tumblr_tumblr_publisher_upload_transaction_type_id;
+		publishing_tumblr_tumblr_publisher_upload_transaction_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION, "PublishingTumblrTumblrPublisherUploadTransaction", &g_define_type_info, 0);
+		g_once_init_leave (&publishing_tumblr_tumblr_publisher_upload_transaction_type_id__volatile, publishing_tumblr_tumblr_publisher_upload_transaction_type_id);
+	}
+	return publishing_tumblr_tumblr_publisher_upload_transaction_type_id__volatile;
+}
+
+
+PublishingTumblrTumblrPublisherUploader*
+publishing_tumblr_tumblr_publisher_uploader_construct (GType object_type,
+                                                       PublishingRESTSupportOAuth1Session* session,
+                                                       SpitPublishingPublishable** publishables,
+                                                       int publishables_length1,
+                                                       const gchar* blog_url)
+{
+	PublishingTumblrTumblrPublisherUploader* self = NULL;
+	gchar* _tmp0_;
+#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (session), NULL);
+#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (blog_url != NULL, NULL);
+#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = (PublishingTumblrTumblrPublisherUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), publishables, publishables_length1);
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = g_strdup (blog_url);
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 (self->priv->blog_url);
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->blog_url = _tmp0_;
+#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return self;
+#line 5259 "TumblrPublishing.c"
+}
+
+
+PublishingTumblrTumblrPublisherUploader*
+publishing_tumblr_tumblr_publisher_uploader_new (PublishingRESTSupportOAuth1Session* session,
+                                                 SpitPublishingPublishable** publishables,
+                                                 int publishables_length1,
+                                                 const gchar* blog_url)
+{
+#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return publishing_tumblr_tumblr_publisher_uploader_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, session, publishables, publishables_length1, blog_url);
+#line 5271 "TumblrPublishing.c"
+}
+
+
+static PublishingRESTSupportTransaction*
+publishing_tumblr_tumblr_publisher_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base,
+                                                                     SpitPublishingPublishable* publishable)
+{
+	PublishingTumblrTumblrPublisherUploader * self;
+	PublishingRESTSupportTransaction* result = NULL;
+	PublishingRESTSupportSession* _tmp0_;
+	PublishingRESTSupportOAuth1Session* _tmp1_;
+	SpitPublishingPublishable* _tmp2_;
+	SpitPublishingPublishable* _tmp3_;
+	const gchar* _tmp4_;
+	PublishingTumblrTumblrPublisherUploadTransaction* _tmp5_;
+	PublishingRESTSupportTransaction* _tmp6_;
+#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, PublishingTumblrTumblrPublisherUploader);
+#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
+#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:665: Create upload transaction");
+#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = publishing_rest_support_batch_uploader_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
+#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_SESSION, PublishingRESTSupportOAuth1Session);
+#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2_ = publishing_rest_support_batch_uploader_get_current_publishable (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
+#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp3_ = _tmp2_;
+#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp4_ = self->priv->blog_url;
+#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp5_ = publishing_tumblr_tumblr_publisher_upload_transaction_new (_tmp1_, _tmp3_, _tmp4_);
+#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
+#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (_tmp3_);
+#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_publishing_rest_support_session_unref0 (_tmp1_);
+#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	result = _tmp6_;
+#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 5316 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_tumblr_publisher_uploader_class_init (PublishingTumblrTumblrPublisherUploaderClass * klass)
+{
+#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_uploader_parent_class = g_type_class_peek_parent (klass);
+#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	((PublishingRESTSupportBatchUploaderClass *) klass)->finalize = publishing_tumblr_tumblr_publisher_uploader_finalize;
+#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherUploaderPrivate));
+#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_tumblr_tumblr_publisher_uploader_real_create_transaction;
+#line 5331 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_tumblr_publisher_uploader_instance_init (PublishingTumblrTumblrPublisherUploader * self)
+{
+	gchar* _tmp0_;
+#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOADER_GET_PRIVATE (self);
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = g_strdup ("");
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->blog_url = _tmp0_;
+#line 5345 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_tumblr_publisher_uploader_finalize (PublishingRESTSupportBatchUploader * obj)
+{
+	PublishingTumblrTumblrPublisherUploader * self;
+#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, PublishingTumblrTumblrPublisherUploader);
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 (self->priv->blog_url);
+#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_tumblr_tumblr_publisher_uploader_parent_class)->finalize (obj);
+#line 5359 "TumblrPublishing.c"
+}
+
+
+GType
+publishing_tumblr_tumblr_publisher_uploader_get_type (void)
+{
+	static volatile gsize publishing_tumblr_tumblr_publisher_uploader_type_id__volatile = 0;
+	if (g_once_init_enter (&publishing_tumblr_tumblr_publisher_uploader_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (PublishingTumblrTumblrPublisherUploaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_tumblr_tumblr_publisher_uploader_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingTumblrTumblrPublisherUploader), 0, (GInstanceInitFunc) publishing_tumblr_tumblr_publisher_uploader_instance_init, NULL };
+		GType publishing_tumblr_tumblr_publisher_uploader_type_id;
+		publishing_tumblr_tumblr_publisher_uploader_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, "PublishingTumblrTumblrPublisherUploader", &g_define_type_info, 0);
+		g_once_init_leave (&publishing_tumblr_tumblr_publisher_uploader_type_id__volatile, publishing_tumblr_tumblr_publisher_uploader_type_id);
+	}
+	return publishing_tumblr_tumblr_publisher_uploader_type_id__volatile;
+}
+
+
+static void
+publishing_tumblr_tumblr_publisher_class_init (PublishingTumblrTumblrPublisherClass * klass)
+{
+#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_parent_class = g_type_class_peek_parent (klass);
+#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherPrivate));
+#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	G_OBJECT_CLASS (klass)->finalize = publishing_tumblr_tumblr_publisher_finalize;
+#line 5386 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_tumblr_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface)
+{
+#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface);
+#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	iface->get_service = (SpitPublishingService* (*) (SpitPublishingPublisher *)) publishing_tumblr_tumblr_publisher_real_get_service;
+#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	iface->is_running = (gboolean (*) (SpitPublishingPublisher *)) publishing_tumblr_tumblr_publisher_real_is_running;
+#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	iface->start = (void (*) (SpitPublishingPublisher *)) publishing_tumblr_tumblr_publisher_real_start;
+#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_tumblr_tumblr_publisher_real_stop;
+#line 5403 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_tumblr_publisher_instance_init (PublishingTumblrTumblrPublisher * self)
+{
+	gchar* _tmp0_;
+#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_GET_PRIVATE (self);
+#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->progress_reporter = NULL;
+#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->progress_reporter_target = self;
+#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->progress_reporter_target_destroy_notify = NULL;
+#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->running = FALSE;
+#line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->was_started = FALSE;
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->session = NULL;
+#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->publishing_options_pane = NULL;
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->sizes = NULL;
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->sizes_length1 = 0;
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->_sizes_size_ = self->priv->sizes_length1;
+#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->blogs = NULL;
+#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->blogs_length1 = 0;
+#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->_blogs_size_ = self->priv->blogs_length1;
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = g_strdup ("");
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->username = _tmp0_;
+#line 5443 "TumblrPublishing.c"
+}
+
+
+static void
+publishing_tumblr_tumblr_publisher_finalize (GObject * obj)
+{
+	PublishingTumblrTumblrPublisher * self;
+	SpitPublishingAuthenticator* _tmp0_;
+	guint _tmp1_;
+#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisher);
+#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->authenticator;
+#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_parse_name ("authenticated", SPIT_PUBLISHING_TYPE_AUTHENTICATOR, &_tmp1_, NULL, FALSE);
+#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_authenticator_authenticated_spit_publishing_authenticator_authenticated, self);
+#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (self->priv->service);
+#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (self->priv->host);
+#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
+#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->progress_reporter = NULL;
+#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->progress_reporter_target = NULL;
+#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->progress_reporter_target_destroy_notify = NULL;
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_publishing_rest_support_session_unref0 (self->priv->session);
+#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (self->priv->publishing_options_pane);
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->sizes = (_vala_array_free (self->priv->sizes, self->priv->sizes_length1, (GDestroyNotify) publishing_tumblr_size_entry_unref), NULL);
+#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->blogs = (_vala_array_free (self->priv->blogs, self->priv->blogs_length1, (GDestroyNotify) publishing_tumblr_blog_entry_unref), NULL);
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 (self->priv->username);
+#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (self->priv->authenticator);
+#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	G_OBJECT_CLASS (publishing_tumblr_tumblr_publisher_parent_class)->finalize (obj);
+#line 5487 "TumblrPublishing.c"
+}
+
+
+GType
+publishing_tumblr_tumblr_publisher_get_type (void)
+{
+	static volatile gsize publishing_tumblr_tumblr_publisher_type_id__volatile = 0;
+	if (g_once_init_enter (&publishing_tumblr_tumblr_publisher_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (PublishingTumblrTumblrPublisherClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_tumblr_tumblr_publisher_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingTumblrTumblrPublisher), 0, (GInstanceInitFunc) publishing_tumblr_tumblr_publisher_instance_init, NULL };
+		static const GInterfaceInfo spit_publishing_publisher_info = { (GInterfaceInitFunc) publishing_tumblr_tumblr_publisher_spit_publishing_publisher_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
+		GType publishing_tumblr_tumblr_publisher_type_id;
+		publishing_tumblr_tumblr_publisher_type_id = g_type_register_static (G_TYPE_OBJECT, "PublishingTumblrTumblrPublisher", &g_define_type_info, 0);
+		g_type_add_interface_static (publishing_tumblr_tumblr_publisher_type_id, SPIT_PUBLISHING_TYPE_PUBLISHER, &spit_publishing_publisher_info);
+		g_once_init_leave (&publishing_tumblr_tumblr_publisher_type_id__volatile, publishing_tumblr_tumblr_publisher_type_id);
+	}
+	return publishing_tumblr_tumblr_publisher_type_id__volatile;
+}
+
+
+static void
+_vala_array_destroy (gpointer array,
+                     gint array_length,
+                     GDestroyNotify destroy_func)
+{
+	if ((array != NULL) && (destroy_func != NULL)) {
+		int i;
+		for (i = 0; i < array_length; i = i + 1) {
+			if (((gpointer*) array)[i] != NULL) {
+				destroy_func (((gpointer*) array)[i]);
+			}
+		}
+	}
+}
+
+
+static void
+_vala_array_free (gpointer array,
+                  gint array_length,
+                  GDestroyNotify destroy_func)
+{
+	_vala_array_destroy (array, array_length, destroy_func);
+	g_free (array);
+}
+
+
+
diff --git a/plugins/shotwell-publishing/TumblrPublishing.vala b/plugins/shotwell-publishing/TumblrPublishing.vala
new file mode 100644
index 0000000..1da9c61
--- /dev/null
+++ b/plugins/shotwell-publishing/TumblrPublishing.vala
@@ -0,0 +1,673 @@
+/* Copyright 2012 BJA Electronics
+ * Author: Jeroen Arnoldus (b.j.arnoldus@bja-electronics.nl)
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ */
+
+public class TumblrService : Object, Spit.Pluggable, Spit.Publishing.Service {
+    private const string ICON_FILENAME = "tumblr.png";
+
+    private static Gdk.Pixbuf[] icon_pixbuf_set = null;
+
+    public TumblrService(GLib.File resource_directory) {
+        if (icon_pixbuf_set == null)
+            icon_pixbuf_set =
+                Resources.load_from_resource(Resources.RESOURCE_PATH + "/" +
+                        ICON_FILENAME);
+    }
+
+    public int get_pluggable_interface(int min_host_interface, int max_host_interface) {
+        return Spit.negotiate_interfaces(min_host_interface, max_host_interface,
+                Spit.Publishing.CURRENT_INTERFACE);
+    }
+
+    public unowned string get_id() {
+        return "org.yorba.shotwell.publishing.tumblr";
+    }
+
+    public unowned string get_pluggable_name() {
+        return "Tumblr";
+    }
+
+    public void get_info(ref Spit.PluggableInfo info) {
+        info.authors = "Jeroen Arnoldus";
+        info.copyright = _("Copyright 2012 BJA Electronics");
+        info.translators = Resources.TRANSLATORS;
+        info.version = _VERSION;
+        info.website_name = Resources.WEBSITE_NAME;
+        info.website_url = Resources.WEBSITE_URL;
+        info.is_license_wordwrapped = false;
+        info.license = Resources.LICENSE;
+        info.icons = icon_pixbuf_set;
+    }
+
+    public void activation(bool enabled) {
+    }
+
+    public Spit.Publishing.Publisher create_publisher(Spit.Publishing.PluginHost host) {
+        return new Publishing.Tumblr.TumblrPublisher(this, host);
+    }
+
+    public Spit.Publishing.Publisher.MediaType get_supported_media() {
+        return (Spit.Publishing.Publisher.MediaType.PHOTO |
+                Spit.Publishing.Publisher.MediaType.VIDEO);
+    }
+}
+
+namespace Publishing.Tumblr {
+
+    internal const string SERVICE_NAME = "Tumblr";
+    internal const string ENDPOINT_URL = "https://www.tumblr.com/";
+    internal const string ENCODE_RFC_3986_EXTRA = "!*'();:@&=+$,/?%#[] \\";
+    internal const int ORIGINAL_SIZE = -1;
+
+
+
+    private class BlogEntry {
+        public string blog;
+        public string url;
+        public BlogEntry(string creator_blog, string creator_url) {
+            blog = creator_blog;
+            url = creator_url;
+        }
+    }
+
+    private class SizeEntry {
+        public string title;
+        public int size;
+
+        public SizeEntry(string creator_title, int creator_size) {
+            title = creator_title;
+            size = creator_size;
+        }
+    }
+
+    public class TumblrPublisher : Spit.Publishing.Publisher, GLib.Object {
+        private Spit.Publishing.Service service;
+        private Spit.Publishing.PluginHost host;
+        private Spit.Publishing.ProgressCallback progress_reporter = null;
+        private bool running = false;
+        private bool was_started = false;
+        private Publishing.RESTSupport.OAuth1.Session session = null;
+        private PublishingOptionsPane publishing_options_pane = null;
+        private SizeEntry[] sizes = null;
+        private BlogEntry[] blogs = null;
+        private string username = "";
+        private Spit.Publishing.Authenticator authenticator;
+
+
+        private SizeEntry[] create_sizes() {
+            SizeEntry[] result = new SizeEntry[0];
+
+            result += new SizeEntry(_("500 × 375 pixels"), 500);
+            result += new SizeEntry(_("1024 × 768 pixels"), 1024);
+            result += new SizeEntry(_("1280 × 853 pixels"), 1280);
+            //Larger images make no sense for Tumblr
+            //        result += new SizeEntry(_("2048 × 1536 pixels"), 2048);
+            //        result += new SizeEntry(_("4096 × 3072 pixels"), 4096);
+            //        result += new SizeEntry(_("Original size"), ORIGINAL_SIZE);
+
+            return result;
+        }
+
+        private BlogEntry[] create_blogs() {
+            BlogEntry[] result = new BlogEntry[0];
+
+
+            return result;
+        }
+
+        public TumblrPublisher(Spit.Publishing.Service service,
+                Spit.Publishing.PluginHost host) {
+            debug("TumblrPublisher instantiated.");
+            this.service = service;
+            this.host = host;
+            this.session = new Publishing.RESTSupport.OAuth1.Session(ENDPOINT_URL);
+            this.sizes = this.create_sizes();
+            this.blogs = this.create_blogs();
+
+            this.authenticator = Publishing.Authenticator.Factory.get_instance().create("tumblr", host);
+            this.authenticator.authenticated.connect(on_authenticator_authenticated);
+        }
+
+        ~TumblrPublisher() {
+            this.authenticator.authenticated.disconnect(on_authenticator_authenticated);
+        }
+
+        // Publisher interface implementation
+
+        public Spit.Publishing.Service get_service() {
+            return service;
+        }
+
+        public Spit.Publishing.PluginHost get_host() {
+            return host;
+        }
+
+        public bool is_running() {
+            return running;
+        }
+
+        internal int get_persistent_default_size() {
+            return host.get_config_int("default_size", 1);
+        }
+
+        internal void set_persistent_default_size(int size) {
+            host.set_config_int("default_size", size);
+        }
+
+        internal int get_persistent_default_blog() {
+            return host.get_config_int("default_blog", 0);
+        }
+
+        internal void set_persistent_default_blog(int blog) {
+            host.set_config_int("default_blog", blog);
+        }
+
+        // Actions and events implementation
+
+        private void on_authenticator_authenticated() {
+            if (!is_running())
+                return;
+
+            debug("EVENT: a fully authenticated session has become available");
+
+            var params = this.authenticator.get_authentication_parameter();
+            Variant consumer_key = null;
+            Variant consumer_secret = null;
+            Variant auth_token = null;
+            Variant auth_token_secret = null;
+
+            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());
+
+            params.lookup_extended("AuthToken", null, out auth_token);
+            params.lookup_extended("AuthTokenSecret", null, out auth_token_secret);
+            session.set_access_phase_credentials(auth_token.get_string(),
+                    auth_token_secret.get_string(), "");
+
+
+            do_get_blogs();
+        }
+
+        private void do_get_blogs() {
+            debug("ACTION: obtain all blogs of the tumblr user");
+            UserInfoFetchTransaction txn = new UserInfoFetchTransaction(session);
+            txn.completed.connect(on_info_request_txn_completed);
+            txn.network_error.connect(on_info_request_txn_error);
+
+            try {
+                txn.execute();
+            } catch (Spit.Publishing.PublishingError err) {
+                host.post_error(err);
+            }
+
+
+        }
+
+
+        private void on_info_request_txn_completed(Publishing.RESTSupport.Transaction txn) {
+            txn.completed.disconnect(on_info_request_txn_completed);
+            txn.network_error.disconnect(on_info_request_txn_error);
+
+            if (!is_running())
+                return;
+
+            debug("EVENT: user info request transaction completed; response = '%s'",
+                    txn.get_response());
+            do_parse_token_info_from_user_request(txn.get_response());
+            do_show_publishing_options_pane();
+        }
+
+
+        private void do_parse_token_info_from_user_request(string response) {
+            debug("ACTION: parsing info request response '%s' into list of available blogs", response);
+            try {
+                var parser = new Json.Parser();
+                parser.load_from_data (response, -1);
+                var root_object = parser.get_root().get_object();
+                this.username = root_object.get_object_member("response").get_object_member("user").get_string_member ("name");
+                debug("Got user name: %s",username);
+                foreach (var blognode in root_object.get_object_member("response").get_object_member("user").get_array_member("blogs").get_elements ()) {
+                    var blog = blognode.get_object ();
+                    string name = blog.get_string_member ("name");
+                    string url = blog.get_string_member ("url").replace("http://","").replace("/","");
+                    debug("Got blog name: %s and url: %s", name, url);
+                    this.blogs += new BlogEntry(name,url);
+                }
+            } catch (Error err) {
+                host.post_error(err);
+            }
+        }
+
+        private void on_info_request_txn_error(Publishing.RESTSupport.Transaction txn,
+                Spit.Publishing.PublishingError err) {
+            txn.completed.disconnect(on_info_request_txn_completed);
+            txn.network_error.disconnect(on_info_request_txn_error);
+
+            if (!is_running())
+                return;
+
+            session.deauthenticate();
+            //invalidate_persistent_session();
+            debug("EVENT: user info request transaction caused a network error");
+            host.post_error(err);
+        }
+
+        private void do_show_publishing_options_pane() {
+            debug("ACTION: displaying publishing options pane");
+            host.set_service_locked(false);
+            PublishingOptionsPane publishing_options_pane =
+                new PublishingOptionsPane(this, host.get_publishable_media_type(), this.sizes, this.blogs, this.username);
+            publishing_options_pane.publish.connect(on_publishing_options_pane_publish);
+            publishing_options_pane.logout.connect(on_publishing_options_pane_logout);
+            host.install_dialog_pane(publishing_options_pane);
+        }
+
+
+
+        private void on_publishing_options_pane_publish() {
+            if (publishing_options_pane != null) {
+                publishing_options_pane.publish.disconnect(on_publishing_options_pane_publish);
+                publishing_options_pane.logout.disconnect(on_publishing_options_pane_logout);
+            }
+
+            if (!is_running())
+                return;
+
+            debug("EVENT: user clicked the 'Publish' button in the publishing options pane");
+            do_publish();
+        }
+
+        private void on_publishing_options_pane_logout() {
+            if (publishing_options_pane != null) {
+                publishing_options_pane.publish.disconnect(on_publishing_options_pane_publish);
+                publishing_options_pane.logout.disconnect(on_publishing_options_pane_logout);
+            }
+
+            if (!is_running())
+                return;
+
+            debug("EVENT: user clicked the 'Logout' button in the publishing options pane");
+
+            do_logout();
+        }
+
+        public static int tumblr_date_time_compare_func(Spit.Publishing.Publishable a,
+                Spit.Publishing.Publishable b) {
+            return a.get_exposure_date_time().compare(b.get_exposure_date_time());
+        }
+
+        private void do_publish() {
+            debug("ACTION: uploading media items to remote server.");
+
+            host.set_service_locked(true);
+
+            progress_reporter = host.serialize_publishables(sizes[get_persistent_default_size()].size);
+
+            // Serialization is a long and potentially cancellable operation, so before we use
+            // the publishables, make sure that the publishing interaction is still running. If it
+            // isn't the publishing environment may be partially torn down so do a short-circuit
+            // return
+            if (!is_running())
+                return;
+
+            // Sort publishables in reverse-chronological order.
+            Spit.Publishing.Publishable[] publishables = host.get_publishables();
+            Gee.ArrayList<Spit.Publishing.Publishable> sorted_list =
+                new Gee.ArrayList<Spit.Publishing.Publishable>();
+            foreach (Spit.Publishing.Publishable p in publishables) {
+                debug("ACTION: add publishable");
+                sorted_list.add(p);
+            }
+            sorted_list.sort(tumblr_date_time_compare_func);
+            string blog_url = this.blogs[get_persistent_default_blog()].url;
+
+            Uploader uploader = new Uploader(session, sorted_list.to_array(),blog_url);
+            uploader.upload_complete.connect(on_upload_complete);
+            uploader.upload_error.connect(on_upload_error);
+            uploader.upload(on_upload_status_updated);
+        }
+
+        private void do_show_success_pane() {
+            debug("ACTION: showing success pane.");
+
+            host.set_service_locked(false);
+            host.install_success_pane();
+        }
+
+
+        private void on_upload_status_updated(int file_number, double completed_fraction) {
+            if (!is_running())
+                return;
+
+            debug("EVENT: uploader reports upload %.2f percent complete.", 100.0 * completed_fraction);
+
+            assert(progress_reporter != null);
+
+            progress_reporter(file_number, completed_fraction);
+        }
+
+        private void on_upload_complete(Publishing.RESTSupport.BatchUploader uploader,
+                int num_published) {
+            if (!is_running())
+                return;
+
+            debug("EVENT: uploader reports upload complete; %d items published.", num_published);
+
+            uploader.upload_complete.disconnect(on_upload_complete);
+            uploader.upload_error.disconnect(on_upload_error);
+
+            do_show_success_pane();
+        }
+
+        private void on_upload_error(Publishing.RESTSupport.BatchUploader uploader,
+                Spit.Publishing.PublishingError err) {
+            if (!is_running())
+                return;
+
+            debug("EVENT: uploader reports upload error = '%s'.", err.message);
+
+            uploader.upload_complete.disconnect(on_upload_complete);
+            uploader.upload_error.disconnect(on_upload_error);
+
+            host.post_error(err);
+        }
+
+
+        private void do_logout() {
+            debug("ACTION: logging user out, deauthenticating session, and erasing stored credentials");
+
+            if (this.authenticator.can_logout()) {
+                this.authenticator.logout();
+            }
+
+            running = false;
+
+            attempt_start();
+        }
+
+        public void attempt_start() {
+            if (is_running())
+                return;
+
+            debug("TumblrPublisher: starting interaction.");
+
+            running = true;
+            this.authenticator.authenticate();
+        }
+
+        public void start() {
+            if (is_running())
+                return;
+
+            if (was_started)
+                error(_("TumblrPublisher: start( ): can’t start; this publisher is not restartable."));
+
+            debug("TumblrPublisher: starting interaction.");
+
+            attempt_start();
+        }
+
+        public void stop() {
+            debug("TumblrPublisher: stop( ) invoked.");
+
+            //        if (session != null)
+            //            session.stop_transactions();
+
+            running = false;
+        }
+
+
+        // UI elements
+
+
+        /**
+         * The publishing options pane.
+         */
+
+
+        internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
+
+
+
+            private Gtk.Builder builder;
+            private Gtk.Box pane_widget = null;
+            private Gtk.Label upload_info_label = null;
+            private Gtk.Label size_label = null;
+            private Gtk.Label blog_label = null;
+            private Gtk.Button logout_button = null;
+            private Gtk.Button publish_button = null;
+            private Gtk.ComboBoxText size_combo = null;
+            private Gtk.ComboBoxText blog_combo = null;
+            private SizeEntry[] sizes = null;
+            private BlogEntry[] blogs = null;
+            private string username = "";
+            private TumblrPublisher publisher = null;
+            private Spit.Publishing.Publisher.MediaType media_type;
+
+            public signal void publish();
+            public signal void logout();
+
+            public PublishingOptionsPane(TumblrPublisher publisher, Spit.Publishing.Publisher.MediaType media_type, SizeEntry[] sizes, BlogEntry[] blogs, string username) {
+
+                this.pane_widget = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
+                this.username = username;
+                this.publisher = publisher;
+                this.media_type = media_type;
+                this.sizes = sizes;
+                this.blogs=blogs;
+
+                try {
+                    builder = new Gtk.Builder();
+                    builder.add_from_resource (Resources.RESOURCE_PATH +
+                            "/tumblr_publishing_options_pane.ui");
+                    builder.connect_signals(null);
+
+                    // pull in the necessary widgets from the glade file
+                    pane_widget = (Gtk.Box) this.builder.get_object("tumblr_pane");
+                    upload_info_label = (Gtk.Label) this.builder.get_object("upload_info_label");
+                    logout_button = (Gtk.Button) this.builder.get_object("logout_button");
+                    publish_button = (Gtk.Button) this.builder.get_object("publish_button");
+                    size_combo = (Gtk.ComboBoxText) this.builder.get_object("size_combo");
+                    size_label = (Gtk.Label) this.builder.get_object("size_label");
+                    blog_combo = (Gtk.ComboBoxText) this.builder.get_object("blog_combo");
+                    blog_label = (Gtk.Label) this.builder.get_object("blog_label");
+
+
+                    string upload_label_text = _("You are logged into Tumblr as %s.\n\n").printf(this.username);
+                    upload_info_label.set_label(upload_label_text);
+
+                    populate_blog_combo();
+                    blog_combo.changed.connect(on_blog_changed);
+
+                    if ((media_type != Spit.Publishing.Publisher.MediaType.VIDEO)) {
+                        populate_size_combo();
+                        size_combo.changed.connect(on_size_changed);
+                    } else {
+                        // publishing -only- video - don't let the user manipulate the photo size choices.
+                        size_combo.set_sensitive(false);
+                        size_label.set_sensitive(false);
+                    }
+
+                    logout_button.clicked.connect(on_logout_clicked);
+                    publish_button.clicked.connect(on_publish_clicked);
+                } catch (Error e) {
+                    warning(_("Could not load UI: %s"), e.message);
+                }
+            }
+
+
+
+
+
+            private void on_logout_clicked() {
+                logout();
+            }
+
+            private void on_publish_clicked() {
+
+
+                publish();
+            }
+
+
+            private void populate_blog_combo() {
+                if (blogs != null) {
+                    foreach (BlogEntry b in blogs)
+                        blog_combo.append_text(b.blog);
+                    blog_combo.set_active(publisher.get_persistent_default_blog());
+                }
+            }
+
+            private void on_blog_changed() {
+                publisher.set_persistent_default_blog(blog_combo.get_active());
+            }
+
+            private void populate_size_combo() {
+                if (sizes != null) {
+                    foreach (SizeEntry e in sizes)
+                        size_combo.append_text(e.title);
+                    size_combo.set_active(publisher.get_persistent_default_size());
+                }
+            }
+
+            private void on_size_changed() {
+                publisher.set_persistent_default_size(size_combo.get_active());
+            }
+
+
+            protected void notify_publish() {
+                publish();
+            }
+
+            protected void notify_logout() {
+                logout();
+            }
+
+            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() {
+                publish.connect(notify_publish);
+                logout.connect(notify_logout);
+            }
+
+            public void on_pane_uninstalled() {
+                publish.disconnect(notify_publish);
+                logout.disconnect(notify_logout);
+            }
+        }
+
+        internal class UserInfoFetchTransaction : Publishing.RESTSupport.OAuth1.Transaction {
+            public UserInfoFetchTransaction(Publishing.RESTSupport.OAuth1.Session session) {
+                base.with_uri(session, "https://api.tumblr.com/v2/user/info",
+                        Publishing.RESTSupport.HttpMethod.POST);
+            }
+        }
+
+        internal class UploadTransaction : Publishing.RESTSupport.OAuth1.UploadTransaction {
+            //Workaround for Soup.URI.encode() to support binary data (i.e. string with \0)
+            private string encode( uint8[] data ){
+                var s = new StringBuilder();
+                char[] bytes = new char[2];
+                bytes[1] = 0;
+                foreach( var byte in data )
+                {
+                    if(byte == 0) {
+                        s.append( "%00" );
+                    } else {
+                        bytes[0] = (char)byte;
+                        s.append( Soup.URI.encode((string) bytes, ENCODE_RFC_3986_EXTRA) );
+                    }
+                }
+                return s.str;
+            }
+
+
+            public UploadTransaction(Publishing.RESTSupport.OAuth1.Session session,Spit.Publishing.Publishable publishable, string blog_url)  {
+                debug("Init upload transaction");
+                base(session, publishable,"https://api.tumblr.com/v2/blog/%s/post".printf(blog_url) );
+
+            }
+
+            public override void execute() throws Spit.Publishing.PublishingError {
+                string payload;
+                size_t payload_length;
+                try {
+                    FileUtils.get_contents(base.publishable.get_serialized_file().get_path(), out payload,
+                            out payload_length);
+
+                    string reqdata = this.encode(payload.data[0:payload_length]);
+
+
+
+                    add_argument("data[0]", reqdata);
+                    add_argument("type", "photo");
+                    string[] keywords = base.publishable.get_publishing_keywords();
+                    string tags = "";
+                    if (keywords != null) {
+                        tags = string.joinv (",", keywords);
+                    }
+                    add_argument("tags", Soup.URI.encode(tags, ENCODE_RFC_3986_EXTRA));
+
+                } catch (FileError e) {
+                    throw new Spit.Publishing.PublishingError.LOCAL_FILE_ERROR(
+                            _("A temporary file needed for publishing is unavailable"));
+
+                }
+
+                this.authorize();
+
+                Publishing.RESTSupport.Argument[] request_arguments = get_arguments();
+                assert(request_arguments.length > 0);
+
+                var request_data = Publishing.RESTSupport.Argument.serialize_list(request_arguments);
+
+                Soup.Message outbound_message = new Soup.Message( "POST", get_endpoint_url());
+                outbound_message.set_request("application/x-www-form-urlencoded", Soup.MemoryUse.COPY, request_data.data);
+
+                // TODO: there must be a better way to iterate over a map
+                Gee.MapIterator<string, string> i = base.message_headers.map_iterator();
+                bool cont = i.next();
+                while(cont) {
+                    outbound_message.request_headers.append(i.get_key(), i.get_value());
+                    cont = i.next();
+                }
+                set_message(outbound_message);
+
+                set_is_executed(true);
+
+                send();
+            }
+        }
+
+
+
+        internal class Uploader : Publishing.RESTSupport.BatchUploader {
+            private string blog_url = "";
+            public Uploader(Publishing.RESTSupport.OAuth1.Session session, Spit.Publishing.Publishable[] publishables, string blog_url) {
+                base(session, publishables);
+                this.blog_url=blog_url;
+
+            }
+
+
+            protected override Publishing.RESTSupport.Transaction create_transaction(
+                    Spit.Publishing.Publishable publishable) {
+                debug("Create upload transaction");
+                return new UploadTransaction((Publishing.RESTSupport.OAuth1.Session) get_session(), get_current_publishable(), this.blog_url);
+
+            }
+        }
+
+    } //class TumblrPublisher
+
+} //namespace Publishing.Tumblr
diff --git a/plugins/shotwell-publishing/YouTubePublishing.c b/plugins/shotwell-publishing/YouTubePublishing.c
index 4be28b4..f823262 100644
--- a/plugins/shotwell-publishing/YouTubePublishing.c
+++ b/plugins/shotwell-publishing/YouTubePublishing.c
@@ -1,4 +1,4 @@
-/* YouTubePublishing.c generated by valac 0.36.6, the Vala compiler
+/* YouTubePublishing.c generated by valac 0.40.4, the Vala compiler
  * generated from YouTubePublishing.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <shotwell-plugin-dev-1.0.h>
@@ -35,6 +36,11 @@
 typedef struct _YouTubeService YouTubeService;
 typedef struct _YouTubeServiceClass YouTubeServiceClass;
 typedef struct _YouTubeServicePrivate YouTubeServicePrivate;
+enum  {
+	YOU_TUBE_SERVICE_0_PROPERTY,
+	YOU_TUBE_SERVICE_NUM_PROPERTIES
+};
+static GParamSpec* you_tube_service_properties[YOU_TUBE_SERVICE_NUM_PROPERTIES];
 #define _g_free0(var) (var = (g_free (var), NULL))
 
 #define PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER (publishing_you_tube_you_tube_publisher_get_type ())
@@ -71,9 +77,19 @@ typedef struct _PublishingYouTubeParamSpecPublishingParameters PublishingYouTube
 typedef struct _PublishingYouTubeYouTubeAuthorizer PublishingYouTubeYouTubeAuthorizer;
 typedef struct _PublishingYouTubeYouTubeAuthorizerClass PublishingYouTubeYouTubeAuthorizerClass;
 typedef struct _PublishingYouTubeYouTubeAuthorizerPrivate PublishingYouTubeYouTubeAuthorizerPrivate;
+enum  {
+	PUBLISHING_YOU_TUBE_YOU_TUBE_AUTHORIZER_0_PROPERTY,
+	PUBLISHING_YOU_TUBE_YOU_TUBE_AUTHORIZER_NUM_PROPERTIES
+};
+static GParamSpec* publishing_you_tube_you_tube_authorizer_properties[PUBLISHING_YOU_TUBE_YOU_TUBE_AUTHORIZER_NUM_PROPERTIES];
 #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;
+enum  {
+	PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_0_PROPERTY,
+	PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_NUM_PROPERTIES
+};
+static GParamSpec* publishing_you_tube_you_tube_publisher_properties[PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_NUM_PROPERTIES];
 #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)))
 
@@ -108,6 +124,11 @@ typedef struct _PublishingYouTubePublishingOptionsPanePrivate PublishingYouTubeP
 
 typedef struct _PublishingYouTubePublishingOptionsPanePrivacyDescription PublishingYouTubePublishingOptionsPanePrivacyDescription;
 typedef struct _PublishingYouTubePublishingOptionsPanePrivacyDescriptionClass PublishingYouTubePublishingOptionsPanePrivacyDescriptionClass;
+enum  {
+	PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_0_PROPERTY,
+	PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_NUM_PROPERTIES
+};
+static GParamSpec* publishing_you_tube_publishing_options_pane_properties[PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_NUM_PROPERTIES];
 #define _g_slist_free0(var) ((var == NULL) ? NULL : (var = (g_slist_free (var), NULL)))
 typedef struct _PublishingYouTubePublishingOptionsPanePrivacyDescriptionPrivate PublishingYouTubePublishingOptionsPanePrivacyDescriptionPrivate;
 #define _publishing_you_tube_publishing_options_pane_privacy_description_unref0(var) ((var == NULL) ? NULL : (var = (publishing_you_tube_publishing_options_pane_privacy_description_unref (var), NULL)))
@@ -115,9 +136,9 @@ typedef struct _PublishingYouTubePublishingOptionsPaneParamSpecPrivacyDescriptio
 enum  {
 	PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL,
 	PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL,
-	PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL
+	PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_NUM_SIGNALS
 };
-static guint publishing_you_tube_publishing_options_pane_signals[PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0};
+static guint publishing_you_tube_publishing_options_pane_signals[PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_NUM_SIGNALS] = {0};
 
 #define PUBLISHING_YOU_TUBE_TYPE_UPLOAD_TRANSACTION (publishing_you_tube_upload_transaction_get_type ())
 #define PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_YOU_TUBE_TYPE_UPLOAD_TRANSACTION, PublishingYouTubeUploadTransaction))
@@ -281,27 +302,19 @@ struct _PublishingYouTubeUploadTransactionSpliceWithProgressData {
 	GInputStream* input;
 	GOutputStream* output;
 	gint64 total_bytes;
-	GFileInfo* _tmp0_;
-	gint64 _tmp1_;
 	gint64 bytes_to_write;
-	gint64 _tmp2_;
+	gint64 _tmp0_;
 	guint8 buffer[8192];
-	gint64 _tmp3_;
+	gint64 _tmp1_;
 	gssize bytes_read;
-	GInputStream* _tmp4_;
-	gssize _tmp5_;
-	gssize _tmp6_;
+	gssize _tmp2_;
 	gssize bytes_written;
-	GOutputStream* _tmp7_;
-	gssize _tmp8_;
-	gssize _tmp9_;
-	gint64 _tmp10_;
-	gssize _tmp11_;
-	gint64 _tmp12_;
-	gint64 _tmp13_;
-	gint64 _tmp14_;
-	GOutputStream* _tmp15_;
-	GInputStream* _tmp16_;
+	gssize _tmp3_;
+	gint64 _tmp4_;
+	gssize _tmp5_;
+	gint64 _tmp6_;
+	gint64 _tmp7_;
+	gint64 _tmp8_;
 	GError * _inner_error_;
 };
 
@@ -339,59 +352,73 @@ static gpointer publishing_you_tube_upload_transaction_parent_class = NULL;
 static gpointer publishing_you_tube_uploader_parent_class = NULL;
 
 GType you_tube_service_get_type (void) G_GNUC_CONST;
-enum  {
-	YOU_TUBE_SERVICE_DUMMY_PROPERTY
-};
 #define YOU_TUBE_SERVICE_ICON_FILENAME "youtube.png"
 YouTubeService* you_tube_service_new (GFile* resource_directory);
-YouTubeService* you_tube_service_construct (GType object_type, GFile* resource_directory);
-static gint you_tube_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface);
+YouTubeService* you_tube_service_construct (GType object_type,
+                                            GFile* resource_directory);
+static gint you_tube_service_real_get_pluggable_interface (SpitPluggable* base,
+                                                    gint min_host_interface,
+                                                    gint max_host_interface);
 static const gchar* you_tube_service_real_get_id (SpitPluggable* base);
 static const gchar* you_tube_service_real_get_pluggable_name (SpitPluggable* base);
-static void you_tube_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info);
-static GdkPixbuf** _vala_array_dup9 (GdkPixbuf** self, int length);
-static SpitPublishingPublisher* you_tube_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host);
-PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host);
-PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host);
+static void you_tube_service_real_get_info (SpitPluggable* base,
+                                     SpitPluggableInfo* info);
+static GdkPixbuf** _vala_array_dup11 (GdkPixbuf** self,
+                               int length);
+static SpitPublishingPublisher* you_tube_service_real_create_publisher (SpitPublishingService* base,
+                                                                 SpitPublishingPluginHost* host);
+PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_new (SpitPublishingService* service,
+                                                                               SpitPublishingPluginHost* host);
+PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_construct (GType object_type,
+                                                                                     SpitPublishingService* service,
+                                                                                     SpitPublishingPluginHost* host);
 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_real_activation (SpitPluggable* base,
+                                       gboolean enabled);
 static void you_tube_service_finalize (GObject * obj);
 #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);
-GParamSpec* publishing_you_tube_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_you_tube_value_set_publishing_parameters (GValue* value, gpointer v_object);
-void publishing_you_tube_value_take_publishing_parameters (GValue* value, gpointer v_object);
+GParamSpec* publishing_you_tube_param_spec_publishing_parameters (const gchar* name,
+                                                                  const gchar* nick,
+                                                                  const gchar* blurb,
+                                                                  GType object_type,
+                                                                  GParamFlags flags);
+void publishing_you_tube_value_set_publishing_parameters (GValue* value,
+                                                          gpointer v_object);
+void publishing_you_tube_value_take_publishing_parameters (GValue* value,
+                                                           gpointer v_object);
 gpointer publishing_you_tube_value_get_publishing_parameters (const GValue* value);
 GType publishing_you_tube_publishing_parameters_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_YOU_TUBE_PUBLISHING_PARAMETERS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_PARAMETERS, PublishingYouTubePublishingParametersPrivate))
-enum  {
-	PUBLISHING_YOU_TUBE_PUBLISHING_PARAMETERS_DUMMY_PROPERTY
-};
 PublishingYouTubePublishingParameters* publishing_you_tube_publishing_parameters_new (void);
 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);
+void publishing_you_tube_publishing_parameters_set_privacy (PublishingYouTubePublishingParameters* self,
+                                                            PublishingYouTubePrivacySetting privacy);
 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);
+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);
+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_real_stop (PublishingRESTSupportGooglePublisher* base);
@@ -400,86 +427,156 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa
 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);
-static void publishing_you_tube_you_tube_publisher_on_upload_status_updated (PublishingYouTubeYouTubePublisher* self, gint file_number, gdouble completed_fraction);
-static void publishing_you_tube_you_tube_publisher_on_upload_complete (PublishingYouTubeYouTubePublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published);
-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);
-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_on_upload_status_updated (PublishingYouTubeYouTubePublisher* self,
+                                                                      gint file_number,
+                                                                      gdouble completed_fraction);
+static void publishing_you_tube_you_tube_publisher_on_upload_complete (PublishingYouTubeYouTubePublisher* self,
+                                                                PublishingRESTSupportBatchUploader* uploader,
+                                                                gint num_published);
+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);
+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);
 GType publishing_you_tube_publishing_options_pane_get_type (void) G_GNUC_CONST;
-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);
+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 (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);
+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);
 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);
-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) G_GNUC_UNUSED;
-static void publishing_you_tube_publishing_options_pane_value_set_privacy_description (GValue* value, gpointer v_object) G_GNUC_UNUSED;
-static void publishing_you_tube_publishing_options_pane_value_take_privacy_description (GValue* value, gpointer v_object) G_GNUC_UNUSED;
+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) G_GNUC_UNUSED;
+static void publishing_you_tube_publishing_options_pane_value_set_privacy_description (GValue* value,
+                                                                                gpointer v_object) G_GNUC_UNUSED;
+static void publishing_you_tube_publishing_options_pane_value_take_privacy_description (GValue* value,
+                                                                                 gpointer v_object) G_GNUC_UNUSED;
 static gpointer publishing_you_tube_publishing_options_pane_value_get_privacy_description (const GValue* value) G_GNUC_UNUSED;
 static GType publishing_you_tube_publishing_options_pane_privacy_description_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 #define PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYouTubePublishingOptionsPanePrivate))
-enum  {
-	PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_DUMMY_PROPERTY
-};
-static PublishingYouTubePublishingOptionsPanePrivacyDescription** publishing_you_tube_publishing_options_pane_create_privacy_descriptions (PublishingYouTubePublishingOptionsPane* self, int* result_length1);
+static PublishingYouTubePublishingOptionsPanePrivacyDescription** publishing_you_tube_publishing_options_pane_create_privacy_descriptions (PublishingYouTubePublishingOptionsPane* self,
+                                                                                                                                    int* result_length1);
 static void publishing_you_tube_publishing_options_pane_on_logout_clicked (PublishingYouTubePublishingOptionsPane* self);
-static void _publishing_you_tube_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_you_tube_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                        gpointer self);
 static void publishing_you_tube_publishing_options_pane_on_publish_clicked (PublishingYouTubePublishingOptionsPane* self);
-static void _publishing_you_tube_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _publishing_you_tube_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                         gpointer self);
 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_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 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_add35 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array,
+                        int* length,
+                        int* size,
+                        PublishingYouTubePublishingOptionsPanePrivacyDescription* value);
+static void _vala_array_add36 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array,
+                        int* length,
+                        int* size,
+                        PublishingYouTubePublishingOptionsPanePrivacyDescription* value);
+static void _vala_array_add37 (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);
 static void publishing_you_tube_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
-enum  {
-	PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_PRIVACY_DESCRIPTION_DUMMY_PROPERTY
-};
 static void publishing_you_tube_publishing_options_pane_privacy_description_finalize (PublishingYouTubePublishingOptionsPanePrivacyDescription * obj);
 static void publishing_you_tube_publishing_options_pane_finalize (GObject * obj);
 GType publishing_you_tube_upload_transaction_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YOU_TUBE_TYPE_UPLOAD_TRANSACTION, PublishingYouTubeUploadTransactionPrivate))
-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"
-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);
+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 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 (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 void publishing_you_tube_upload_transaction_splice_with_progress_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data);
+static void publishing_you_tube_upload_transaction_splice_with_progress_async_ready_wrapper (GObject *source_object,
+                                                                                      GAsyncResult *res,
+                                                                                      void *user_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_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  {
-	PUBLISHING_YOU_TUBE_UPLOADER_DUMMY_PROPERTY
-};
-static PublishingRESTSupportTransaction* publishing_you_tube_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable);
+static PublishingRESTSupportTransaction* publishing_you_tube_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base,
+                                                                                        SpitPublishingPublishable* publishable);
 static void publishing_you_tube_uploader_finalize (PublishingRESTSupportBatchUploader * 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);
-
-
-YouTubeService* you_tube_service_construct (GType object_type, GFile* resource_directory) {
+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);
+
+
+YouTubeService*
+you_tube_service_construct (GType object_type,
+                            GFile* resource_directory)
+{
 	YouTubeService * self = NULL;
 	GdkPixbuf** _tmp0_;
 	gint _tmp0__length1;
@@ -493,7 +590,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 497 "YouTubePublishing.c"
+#line 594 "YouTubePublishing.c"
 		gint _tmp1_;
 		GdkPixbuf** _tmp2_;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -506,44 +603,43 @@ 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 510 "YouTubePublishing.c"
+#line 607 "YouTubePublishing.c"
 	}
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self;
-#line 514 "YouTubePublishing.c"
+#line 611 "YouTubePublishing.c"
 }
 
 
-YouTubeService* you_tube_service_new (GFile* resource_directory) {
+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 521 "YouTubePublishing.c"
+#line 620 "YouTubePublishing.c"
 }
 
 
-static gint you_tube_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) {
+static gint
+you_tube_service_real_get_pluggable_interface (SpitPluggable* base,
+                                               gint min_host_interface,
+                                               gint max_host_interface)
+{
 	YouTubeService * self;
 	gint result = 0;
-	gint _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
 #line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_YOU_TUBE_SERVICE, YouTubeService);
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp0_ = min_host_interface;
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp1_ = max_host_interface;
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp2_ = spit_negotiate_interfaces (_tmp0_, _tmp1_, SPIT_PUBLISHING_CURRENT_INTERFACE);
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	result = _tmp2_;
+	result = spit_negotiate_interfaces (min_host_interface, max_host_interface, SPIT_PUBLISHING_CURRENT_INTERFACE);
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 543 "YouTubePublishing.c"
+#line 637 "YouTubePublishing.c"
 }
 
 
-static const gchar* you_tube_service_real_get_id (SpitPluggable* base) {
+static const gchar*
+you_tube_service_real_get_id (SpitPluggable* base)
+{
 	YouTubeService * self;
 	const gchar* result = NULL;
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -552,11 +648,13 @@ 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 556 "YouTubePublishing.c"
+#line 652 "YouTubePublishing.c"
 }
 
 
-static const gchar* you_tube_service_real_get_pluggable_name (SpitPluggable* base) {
+static const gchar*
+you_tube_service_real_get_pluggable_name (SpitPluggable* base)
+{
 	YouTubeService * self;
 	const gchar* result = NULL;
 #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -565,39 +663,47 @@ 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 569 "YouTubePublishing.c"
+#line 667 "YouTubePublishing.c"
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+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 576 "YouTubePublishing.c"
+#line 676 "YouTubePublishing.c"
 }
 
 
-static GdkPixbuf** _vala_array_dup9 (GdkPixbuf** self, int length) {
+static GdkPixbuf**
+_vala_array_dup11 (GdkPixbuf** self,
+                   int length)
+{
 	GdkPixbuf** result;
 	int i;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	result = g_new0 (GdkPixbuf*, length + 1);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 587 "YouTubePublishing.c"
+#line 690 "YouTubePublishing.c"
 		GdkPixbuf* _tmp0_;
 #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 593 "YouTubePublishing.c"
+#line 696 "YouTubePublishing.c"
 	}
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 597 "YouTubePublishing.c"
+#line 700 "YouTubePublishing.c"
 }
 
 
-static void you_tube_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) {
+static void
+you_tube_service_real_get_info (SpitPluggable* base,
+                                SpitPluggableInfo* info)
+{
 	YouTubeService * self;
 	gchar* _tmp0_;
 	gchar* _tmp1_;
@@ -663,7 +769,7 @@ static void you_tube_service_real_get_info (SpitPluggable* base, SpitPluggableIn
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp7__length1 = you_tube_service_icon_pixbuf_set_length1;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup9 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_);
+	_tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup11 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp8__length1 = _tmp7__length1;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -672,32 +778,34 @@ static void you_tube_service_real_get_info (SpitPluggable* base, SpitPluggableIn
 	(*info).icons = _tmp8_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	(*info).icons_length1 = _tmp8__length1;
-#line 676 "YouTubePublishing.c"
+#line 782 "YouTubePublishing.c"
 }
 
 
-static SpitPublishingPublisher* you_tube_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) {
+static SpitPublishingPublisher*
+you_tube_service_real_create_publisher (SpitPublishingService* base,
+                                        SpitPublishingPluginHost* host)
+{
 	YouTubeService * self;
 	SpitPublishingPublisher* result = NULL;
-	SpitPublishingPluginHost* _tmp0_;
-	PublishingYouTubeYouTubePublisher* _tmp1_;
+	PublishingYouTubeYouTubePublisher* _tmp0_;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_YOU_TUBE_SERVICE, YouTubeService);
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp0_ = host;
+	_tmp0_ = publishing_you_tube_you_tube_publisher_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService), host);
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp1_ = publishing_you_tube_you_tube_publisher_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService), _tmp0_);
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
+	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 697 "YouTubePublishing.c"
+#line 803 "YouTubePublishing.c"
 }
 
 
-static SpitPublishingPublisherMediaType you_tube_service_real_get_supported_media (SpitPublishingService* base) {
+static SpitPublishingPublisherMediaType
+you_tube_service_real_get_supported_media (SpitPublishingService* base)
+{
 	YouTubeService * self;
 	SpitPublishingPublisherMediaType result = 0;
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -706,28 +814,35 @@ 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 710 "YouTubePublishing.c"
+#line 818 "YouTubePublishing.c"
 }
 
 
-static void you_tube_service_real_activation (SpitPluggable* base, gboolean enabled) {
+static void
+you_tube_service_real_activation (SpitPluggable* base,
+                                  gboolean enabled)
+{
 	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 718 "YouTubePublishing.c"
+#line 829 "YouTubePublishing.c"
 }
 
 
-static void you_tube_service_class_init (YouTubeServiceClass * klass) {
+static void
+you_tube_service_class_init (YouTubeServiceClass * klass)
+{
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	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 727 "YouTubePublishing.c"
+#line 840 "YouTubePublishing.c"
 }
 
 
-static void you_tube_service_spit_pluggable_interface_init (SpitPluggableIface * iface) {
+static void
+you_tube_service_spit_pluggable_interface_init (SpitPluggableIface * iface)
+{
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	you_tube_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -740,36 +855,44 @@ 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 744 "YouTubePublishing.c"
+#line 859 "YouTubePublishing.c"
 }
 
 
-static void you_tube_service_spit_publishing_service_interface_init (SpitPublishingServiceIface * iface) {
+static void
+you_tube_service_spit_publishing_service_interface_init (SpitPublishingServiceIface * iface)
+{
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	you_tube_service_spit_publishing_service_parent_iface = g_type_interface_peek_parent (iface);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	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 755 "YouTubePublishing.c"
+#line 872 "YouTubePublishing.c"
 }
 
 
-static void you_tube_service_instance_init (YouTubeService * self) {
+static void
+you_tube_service_instance_init (YouTubeService * self)
+{
 }
 
 
-static void you_tube_service_finalize (GObject * obj) {
+static void
+you_tube_service_finalize (GObject * obj)
+{
 	YouTubeService * self;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	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 769 "YouTubePublishing.c"
+#line 890 "YouTubePublishing.c"
 }
 
 
-GType you_tube_service_get_type (void) {
+GType
+you_tube_service_get_type (void)
+{
 	static volatile gsize you_tube_service_type_id__volatile = 0;
 	if (g_once_init_enter (&you_tube_service_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (YouTubeServiceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) you_tube_service_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (YouTubeService), 0, (GInstanceInitFunc) you_tube_service_instance_init, NULL };
@@ -785,7 +908,9 @@ GType you_tube_service_get_type (void) {
 }
 
 
-GType publishing_you_tube_privacy_setting_get_type (void) {
+GType
+publishing_you_tube_privacy_setting_get_type (void)
+{
 	static volatile gsize publishing_you_tube_privacy_setting_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_you_tube_privacy_setting_type_id__volatile)) {
 		static const GEnumValue values[] = {{PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PUBLIC, "PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PUBLIC", "public"}, {PUBLISHING_YOU_TUBE_PRIVACY_SETTING_UNLISTED, "PUBLISHING_YOU_TUBE_PRIVACY_SETTING_UNLISTED", "unlisted"}, {PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PRIVATE, "PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PRIVATE", "private"}, {0, NULL, NULL}};
@@ -797,7 +922,9 @@ GType publishing_you_tube_privacy_setting_get_type (void) {
 }
 
 
-PublishingYouTubePublishingParameters* publishing_you_tube_publishing_parameters_construct (GType object_type) {
+PublishingYouTubePublishingParameters*
+publishing_you_tube_publishing_parameters_construct (GType object_type)
+{
 	PublishingYouTubePublishingParameters* self = NULL;
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = (PublishingYouTubePublishingParameters*) g_type_create_instance (object_type);
@@ -809,18 +936,22 @@ PublishingYouTubePublishingParameters* publishing_you_tube_publishing_parameters
 	self->priv->user_name = NULL;
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self;
-#line 813 "YouTubePublishing.c"
+#line 940 "YouTubePublishing.c"
 }
 
 
-PublishingYouTubePublishingParameters* publishing_you_tube_publishing_parameters_new (void) {
+PublishingYouTubePublishingParameters*
+publishing_you_tube_publishing_parameters_new (void)
+{
 #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 820 "YouTubePublishing.c"
+#line 949 "YouTubePublishing.c"
 }
 
 
-PublishingYouTubePrivacySetting publishing_you_tube_publishing_parameters_get_privacy (PublishingYouTubePublishingParameters* self) {
+PublishingYouTubePrivacySetting
+publishing_you_tube_publishing_parameters_get_privacy (PublishingYouTubePublishingParameters* self)
+{
 	PublishingYouTubePrivacySetting result = 0;
 	PublishingYouTubePrivacySetting _tmp0_;
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -831,23 +962,25 @@ PublishingYouTubePrivacySetting publishing_you_tube_publishing_parameters_get_pr
 	result = _tmp0_;
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 835 "YouTubePublishing.c"
+#line 966 "YouTubePublishing.c"
 }
 
 
-void publishing_you_tube_publishing_parameters_set_privacy (PublishingYouTubePublishingParameters* self, PublishingYouTubePrivacySetting privacy) {
-	PublishingYouTubePrivacySetting _tmp0_;
+void
+publishing_you_tube_publishing_parameters_set_privacy (PublishingYouTubePublishingParameters* self,
+                                                       PublishingYouTubePrivacySetting privacy)
+{
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_PARAMETERS (self));
 #line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp0_ = privacy;
-#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	self->priv->privacy = _tmp0_;
-#line 847 "YouTubePublishing.c"
+	self->priv->privacy = privacy;
+#line 978 "YouTubePublishing.c"
 }
 
 
-gchar* publishing_you_tube_publishing_parameters_get_user_name (PublishingYouTubePublishingParameters* self) {
+gchar*
+publishing_you_tube_publishing_parameters_get_user_name (PublishingYouTubePublishingParameters* self)
+{
 	gchar* result = NULL;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
@@ -861,125 +994,150 @@ gchar* publishing_you_tube_publishing_parameters_get_user_name (PublishingYouTub
 	result = _tmp1_;
 #line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 865 "YouTubePublishing.c"
+#line 998 "YouTubePublishing.c"
 }
 
 
-void publishing_you_tube_publishing_parameters_set_user_name (PublishingYouTubePublishingParameters* self, const gchar* user_name) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
+void
+publishing_you_tube_publishing_parameters_set_user_name (PublishingYouTubePublishingParameters* self,
+                                                         const gchar* user_name)
+{
+	gchar* _tmp0_;
 #line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_PARAMETERS (self));
 #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp0_ = user_name;
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (user_name);
 #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_free0 (self->priv->user_name);
 #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	self->priv->user_name = _tmp1_;
-#line 882 "YouTubePublishing.c"
+	self->priv->user_name = _tmp0_;
+#line 1015 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_value_publishing_parameters_init (GValue* value) {
+static void
+publishing_you_tube_value_publishing_parameters_init (GValue* value)
+{
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 889 "YouTubePublishing.c"
+#line 1024 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_value_publishing_parameters_free_value (GValue* value) {
+static void
+publishing_you_tube_value_publishing_parameters_free_value (GValue* value)
+{
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (value->data[0].v_pointer) {
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_you_tube_publishing_parameters_unref (value->data[0].v_pointer);
-#line 898 "YouTubePublishing.c"
+#line 1035 "YouTubePublishing.c"
 	}
 }
 
 
-static void publishing_you_tube_value_publishing_parameters_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_you_tube_value_publishing_parameters_copy_value (const GValue* src_value,
+                                                            GValue* dest_value)
+{
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (src_value->data[0].v_pointer) {
 #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 908 "YouTubePublishing.c"
+#line 1048 "YouTubePublishing.c"
 	} else {
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 912 "YouTubePublishing.c"
+#line 1052 "YouTubePublishing.c"
 	}
 }
 
 
-static gpointer publishing_you_tube_value_publishing_parameters_peek_pointer (const GValue* value) {
+static gpointer
+publishing_you_tube_value_publishing_parameters_peek_pointer (const GValue* value)
+{
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return value->data[0].v_pointer;
-#line 920 "YouTubePublishing.c"
+#line 1062 "YouTubePublishing.c"
 }
 
 
-static gchar* publishing_you_tube_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_you_tube_value_publishing_parameters_collect_value (GValue* value,
+                                                               guint n_collect_values,
+                                                               GTypeCValue* collect_values,
+                                                               guint collect_flags)
+{
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 927 "YouTubePublishing.c"
+#line 1074 "YouTubePublishing.c"
 		PublishingYouTubePublishingParameters * object;
 		object = collect_values[0].v_pointer;
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #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 934 "YouTubePublishing.c"
+#line 1081 "YouTubePublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #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 938 "YouTubePublishing.c"
+#line 1085 "YouTubePublishing.c"
 		}
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = publishing_you_tube_publishing_parameters_ref (object);
-#line 942 "YouTubePublishing.c"
+#line 1089 "YouTubePublishing.c"
 	} else {
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 946 "YouTubePublishing.c"
+#line 1093 "YouTubePublishing.c"
 	}
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return NULL;
-#line 950 "YouTubePublishing.c"
+#line 1097 "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) {
+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 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (!object_p) {
 #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 961 "YouTubePublishing.c"
+#line 1113 "YouTubePublishing.c"
 	}
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*object_p = NULL;
-#line 967 "YouTubePublishing.c"
+#line 1119 "YouTubePublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 971 "YouTubePublishing.c"
+#line 1123 "YouTubePublishing.c"
 	} else {
 #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 975 "YouTubePublishing.c"
+#line 1127 "YouTubePublishing.c"
 	}
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return NULL;
-#line 979 "YouTubePublishing.c"
+#line 1131 "YouTubePublishing.c"
 }
 
 
-GParamSpec* publishing_you_tube_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+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 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);
@@ -989,20 +1147,25 @@ GParamSpec* publishing_you_tube_param_spec_publishing_parameters (const gchar* n
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 993 "YouTubePublishing.c"
+#line 1151 "YouTubePublishing.c"
 }
 
 
-gpointer publishing_you_tube_value_get_publishing_parameters (const GValue* value) {
+gpointer
+publishing_you_tube_value_get_publishing_parameters (const GValue* value)
+{
 #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 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return value->data[0].v_pointer;
-#line 1002 "YouTubePublishing.c"
+#line 1162 "YouTubePublishing.c"
 }
 
 
-void publishing_you_tube_value_set_publishing_parameters (GValue* value, gpointer v_object) {
+void
+publishing_you_tube_value_set_publishing_parameters (GValue* value,
+                                                     gpointer v_object)
+{
 	PublishingYouTubePublishingParameters * old;
 #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));
@@ -1018,22 +1181,25 @@ void publishing_you_tube_value_set_publishing_parameters (GValue* value, gpointe
 		value->data[0].v_pointer = v_object;
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_you_tube_publishing_parameters_ref (value->data[0].v_pointer);
-#line 1022 "YouTubePublishing.c"
+#line 1185 "YouTubePublishing.c"
 	} else {
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1026 "YouTubePublishing.c"
+#line 1189 "YouTubePublishing.c"
 	}
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (old) {
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_you_tube_publishing_parameters_unref (old);
-#line 1032 "YouTubePublishing.c"
+#line 1195 "YouTubePublishing.c"
 	}
 }
 
 
-void publishing_you_tube_value_take_publishing_parameters (GValue* value, gpointer v_object) {
+void
+publishing_you_tube_value_take_publishing_parameters (GValue* value,
+                                                      gpointer v_object)
+{
 	PublishingYouTubePublishingParameters * old;
 #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));
@@ -1047,42 +1213,48 @@ void publishing_you_tube_value_take_publishing_parameters (GValue* value, gpoint
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1051 "YouTubePublishing.c"
+#line 1217 "YouTubePublishing.c"
 	} else {
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1055 "YouTubePublishing.c"
+#line 1221 "YouTubePublishing.c"
 	}
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (old) {
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_you_tube_publishing_parameters_unref (old);
-#line 1061 "YouTubePublishing.c"
+#line 1227 "YouTubePublishing.c"
 	}
 }
 
 
-static void publishing_you_tube_publishing_parameters_class_init (PublishingYouTubePublishingParametersClass * klass) {
+static void
+publishing_you_tube_publishing_parameters_class_init (PublishingYouTubePublishingParametersClass * klass)
+{
 #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 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	((PublishingYouTubePublishingParametersClass *) klass)->finalize = publishing_you_tube_publishing_parameters_finalize;
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingYouTubePublishingParametersPrivate));
-#line 1073 "YouTubePublishing.c"
+#line 1241 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_publishing_parameters_instance_init (PublishingYouTubePublishingParameters * self) {
+static void
+publishing_you_tube_publishing_parameters_instance_init (PublishingYouTubePublishingParameters * self)
+{
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv = PUBLISHING_YOU_TUBE_PUBLISHING_PARAMETERS_GET_PRIVATE (self);
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->ref_count = 1;
-#line 1082 "YouTubePublishing.c"
+#line 1252 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_publishing_parameters_finalize (PublishingYouTubePublishingParameters * obj) {
+static void
+publishing_you_tube_publishing_parameters_finalize (PublishingYouTubePublishingParameters * obj)
+{
 	PublishingYouTubePublishingParameters * self;
 #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);
@@ -1090,11 +1262,13 @@ static void publishing_you_tube_publishing_parameters_finalize (PublishingYouTub
 	g_signal_handlers_destroy (self);
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_free0 (self->priv->user_name);
-#line 1094 "YouTubePublishing.c"
+#line 1266 "YouTubePublishing.c"
 }
 
 
-GType publishing_you_tube_publishing_parameters_get_type (void) {
+GType
+publishing_you_tube_publishing_parameters_get_type (void)
+{
 	static volatile gsize publishing_you_tube_publishing_parameters_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_you_tube_publishing_parameters_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { publishing_you_tube_value_publishing_parameters_init, publishing_you_tube_value_publishing_parameters_free_value, publishing_you_tube_value_publishing_parameters_copy_value, publishing_you_tube_value_publishing_parameters_peek_pointer, "p", publishing_you_tube_value_publishing_parameters_collect_value, "p", publishing_you_tube_value_publishing_parameters_lcopy_value };
@@ -1108,18 +1282,22 @@ GType publishing_you_tube_publishing_parameters_get_type (void) {
 }
 
 
-gpointer publishing_you_tube_publishing_parameters_ref (gpointer instance) {
+gpointer
+publishing_you_tube_publishing_parameters_ref (gpointer instance)
+{
 	PublishingYouTubePublishingParameters * self;
 	self = instance;
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return instance;
-#line 1119 "YouTubePublishing.c"
+#line 1295 "YouTubePublishing.c"
 }
 
 
-void publishing_you_tube_publishing_parameters_unref (gpointer instance) {
+void
+publishing_you_tube_publishing_parameters_unref (gpointer instance)
+{
 	PublishingYouTubePublishingParameters * self;
 	self = instance;
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1128,24 +1306,28 @@ void publishing_you_tube_publishing_parameters_unref (gpointer instance) {
 		PUBLISHING_YOU_TUBE_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self);
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1132 "YouTubePublishing.c"
+#line 1310 "YouTubePublishing.c"
 	}
 }
 
 
-static gpointer _publishing_rest_support_session_ref0 (gpointer self) {
+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 1140 "YouTubePublishing.c"
+#line 1320 "YouTubePublishing.c"
 }
 
 
-PublishingYouTubeYouTubeAuthorizer* publishing_you_tube_you_tube_authorizer_construct (GType object_type, PublishingRESTSupportGoogleSession* session, SpitPublishingAuthenticator* authenticator) {
+PublishingYouTubeYouTubeAuthorizer*
+publishing_you_tube_you_tube_authorizer_construct (GType object_type,
+                                                   PublishingRESTSupportGoogleSession* session,
+                                                   SpitPublishingAuthenticator* authenticator)
+{
 	PublishingYouTubeYouTubeAuthorizer * self = NULL;
 	PublishingRESTSupportGoogleSession* _tmp0_;
-	PublishingRESTSupportGoogleSession* _tmp1_;
-	SpitPublishingAuthenticator* _tmp2_;
-	SpitPublishingAuthenticator* _tmp3_;
+	SpitPublishingAuthenticator* _tmp1_;
 #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"
@@ -1153,35 +1335,37 @@ PublishingYouTubeYouTubeAuthorizer* publishing_you_tube_you_tube_authorizer_cons
 #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_);
+	_tmp0_ = _publishing_rest_support_session_ref0 (session);
 #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;
+	self->priv->session = _tmp0_;
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp3_ = _g_object_ref0 (_tmp2_);
+	_tmp1_ = _g_object_ref0 (authenticator);
 #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_;
+	self->priv->authenticator = _tmp1_;
 #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self;
-#line 1174 "YouTubePublishing.c"
+#line 1352 "YouTubePublishing.c"
 }
 
 
-PublishingYouTubeYouTubeAuthorizer* publishing_you_tube_you_tube_authorizer_new (PublishingRESTSupportGoogleSession* session, SpitPublishingAuthenticator* authenticator) {
+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 1181 "YouTubePublishing.c"
+#line 1362 "YouTubePublishing.c"
 }
 
 
-static gboolean publishing_you_tube_you_tube_authorizer_real_is_authorized_for_domain (GDataAuthorizer* base, GDataAuthorizationDomain* domain) {
+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"
@@ -1192,22 +1376,24 @@ static gboolean publishing_you_tube_you_tube_authorizer_real_is_authorized_for_d
 	result = TRUE;
 #line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 1196 "YouTubePublishing.c"
+#line 1380 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_you_tube_authorizer_real_process_request (GDataAuthorizer* base, GDataAuthorizationDomain* domain, SoupMessage* message) {
+static void
+publishing_you_tube_you_tube_authorizer_real_process_request (GDataAuthorizer* base,
+                                                              GDataAuthorizationDomain* domain,
+                                                              SoupMessage* message)
+{
 	PublishingYouTubeYouTubeAuthorizer * self;
-	GDataAuthorizationDomain* _tmp0_;
 	gchar* header = NULL;
-	PublishingRESTSupportGoogleSession* _tmp1_;
+	PublishingRESTSupportGoogleSession* _tmp0_;
+	gchar* _tmp1_;
 	gchar* _tmp2_;
 	gchar* _tmp3_;
 	gchar* _tmp4_;
-	gchar* _tmp5_;
-	SoupMessage* _tmp6_;
-	SoupMessageHeaders* _tmp7_;
-	const gchar* _tmp8_;
+	SoupMessageHeaders* _tmp5_;
+	const gchar* _tmp6_;
 #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"
@@ -1215,42 +1401,42 @@ static void publishing_you_tube_you_tube_authorizer_real_process_request (GDataA
 #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) {
+	if (domain == NULL) {
 #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 1224 "YouTubePublishing.c"
+#line 1408 "YouTubePublishing.c"
 	}
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp1_ = self->priv->session;
+	_tmp0_ = self->priv->session;
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp2_ = publishing_rest_support_google_session_get_access_token (_tmp1_);
+	_tmp1_ = publishing_rest_support_google_session_get_access_token (_tmp0_);
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp3_ = _tmp2_;
+	_tmp2_ = _tmp1_;
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp4_ = g_strdup_printf ("Bearer %s", _tmp3_);
+	_tmp3_ = g_strdup_printf ("Bearer %s", _tmp2_);
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp5_ = _tmp4_;
+	_tmp4_ = _tmp3_;
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (_tmp3_);
+	_g_free0 (_tmp2_);
 #line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	header = _tmp5_;
+	header = _tmp4_;
 #line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp6_ = message;
+	_tmp5_ = message->request_headers;
 #line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp7_ = _tmp6_->request_headers;
+	_tmp6_ = header;
 #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_);
+	soup_message_headers_replace (_tmp5_, "Authorization", _tmp6_);
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_free0 (header);
-#line 1250 "YouTubePublishing.c"
+#line 1432 "YouTubePublishing.c"
 }
 
 
-static gboolean publishing_you_tube_you_tube_authorizer_real_refresh_authorization (GDataAuthorizer* base, GCancellable* cancellable, GError** error) {
+static gboolean
+publishing_you_tube_you_tube_authorizer_real_refresh_authorization (GDataAuthorizer* base,
+                                                                    GCancellable* cancellable,
+                                                                    GError** error)
+{
 	PublishingYouTubeYouTubeAuthorizer * self;
 	gboolean result = FALSE;
 	SpitPublishingAuthenticator* _tmp0_;
@@ -1266,22 +1452,26 @@ static gboolean publishing_you_tube_you_tube_authorizer_real_refresh_authorizati
 	result = TRUE;
 #line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 1270 "YouTubePublishing.c"
+#line 1456 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_you_tube_authorizer_class_init (PublishingYouTubeYouTubeAuthorizerClass * klass) {
+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 1281 "YouTubePublishing.c"
+#line 1469 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_you_tube_authorizer_gdata_authorizer_interface_init (GDataAuthorizerInterface * iface) {
+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"
@@ -1290,18 +1480,22 @@ static void publishing_you_tube_you_tube_authorizer_gdata_authorizer_interface_i
 	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 1294 "YouTubePublishing.c"
+#line 1484 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_you_tube_authorizer_instance_init (PublishingYouTubeYouTubeAuthorizer * self) {
+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 1301 "YouTubePublishing.c"
+#line 1493 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_you_tube_authorizer_finalize (GObject * obj) {
+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);
@@ -1311,11 +1505,13 @@ static void publishing_you_tube_you_tube_authorizer_finalize (GObject * obj) {
 	_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 1315 "YouTubePublishing.c"
+#line 1509 "YouTubePublishing.c"
 }
 
 
-GType publishing_you_tube_you_tube_authorizer_get_type (void) {
+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 };
@@ -1329,29 +1525,27 @@ GType publishing_you_tube_you_tube_authorizer_get_type (void) {
 }
 
 
-PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) {
+PublishingYouTubeYouTubePublisher*
+publishing_you_tube_you_tube_publisher_construct (GType object_type,
+                                                  SpitPublishingService* service,
+                                                  SpitPublishingPluginHost* host)
+{
 	PublishingYouTubeYouTubePublisher * self = NULL;
-	SpitPublishingService* _tmp0_;
-	SpitPublishingPluginHost* _tmp1_;
-	PublishingYouTubePublishingParameters* _tmp2_;
+	PublishingYouTubePublishingParameters* _tmp0_;
 #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), 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 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp1_ = host;
-#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/");
+	self = (PublishingYouTubeYouTubePublisher*) publishing_rest_support_google_publisher_construct (object_type, service, host, "https://gdata.youtube.com/");
 #line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->running = FALSE;
 #line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp2_ = publishing_you_tube_publishing_parameters_new ();
+	_tmp0_ = 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 = _tmp2_;
+	self->priv->publishing_parameters = _tmp0_;
 #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"
@@ -1368,18 +1562,23 @@ PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_constr
 	self->priv->progress_reporter_target_destroy_notify = NULL;
 #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self;
-#line 1372 "YouTubePublishing.c"
+#line 1566 "YouTubePublishing.c"
 }
 
 
-PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
+PublishingYouTubeYouTubePublisher*
+publishing_you_tube_you_tube_publisher_new (SpitPublishingService* service,
+                                            SpitPublishingPluginHost* host)
+{
 #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 1379 "YouTubePublishing.c"
+#line 1576 "YouTubePublishing.c"
 }
 
 
-static gboolean publishing_you_tube_you_tube_publisher_real_is_running (PublishingRESTSupportGooglePublisher* base) {
+static gboolean
+publishing_you_tube_you_tube_publisher_real_is_running (PublishingRESTSupportGooglePublisher* base)
+{
 	PublishingYouTubeYouTubePublisher * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_;
@@ -1391,37 +1590,38 @@ 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 1395 "YouTubePublishing.c"
+#line 1594 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_you_tube_publisher_real_start (PublishingRESTSupportGooglePublisher* base) {
+static void
+publishing_you_tube_you_tube_publisher_real_start (PublishingRESTSupportGooglePublisher* base)
+{
 	PublishingYouTubeYouTubePublisher * self;
-	gboolean _tmp0_;
-	SpitPublishingAuthenticator* _tmp1_;
+	SpitPublishingAuthenticator* _tmp0_;
 #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"
 	g_debug ("YouTubePublishing.vala:141: YouTubePublisher: started.");
 #line 143 "/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 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	if (_tmp0_) {
+	if (publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher))) {
 #line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 1413 "YouTubePublishing.c"
+#line 1611 "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->authenticator;
+	_tmp0_ = self->priv->authenticator;
 #line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	spit_publishing_authenticator_authenticate (_tmp1_);
-#line 1421 "YouTubePublishing.c"
+	spit_publishing_authenticator_authenticate (_tmp0_);
+#line 1619 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_you_tube_publisher_real_stop (PublishingRESTSupportGooglePublisher* base) {
+static void
+publishing_you_tube_you_tube_publisher_real_stop (PublishingRESTSupportGooglePublisher* base)
+{
 	PublishingYouTubeYouTubePublisher * self;
 	PublishingRESTSupportGoogleSession* _tmp0_;
 	PublishingRESTSupportGoogleSession* _tmp1_;
@@ -1439,11 +1639,13 @@ static void publishing_you_tube_you_tube_publisher_real_stop (PublishingRESTSupp
 	publishing_rest_support_session_stop_transactions (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
 #line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_rest_support_session_unref0 (_tmp1_);
-#line 1443 "YouTubePublishing.c"
+#line 1643 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_you_tube_publisher_real_on_login_flow_complete (PublishingRESTSupportGooglePublisher* base) {
+static void
+publishing_you_tube_you_tube_publisher_real_on_login_flow_complete (PublishingRESTSupportGooglePublisher* base)
+{
 	PublishingYouTubeYouTubePublisher * self;
 	PublishingYouTubePublishingParameters* _tmp0_;
 	PublishingRESTSupportGoogleSession* _tmp1_;
@@ -1498,218 +1700,205 @@ static void publishing_you_tube_you_tube_publisher_real_on_login_flow_complete (
 	_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 1502 "YouTubePublishing.c"
+#line 1704 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_you_tube_publisher_on_publishing_options_logout (PublishingYouTubeYouTubePublisher* self) {
-	gboolean _tmp0_;
+static void
+publishing_you_tube_you_tube_publisher_on_publishing_options_logout (PublishingYouTubeYouTubePublisher* self)
+{
 #line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
 #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 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 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	if (!_tmp0_) {
+	if (!publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher))) {
 #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 1518 "YouTubePublishing.c"
+#line 1719 "YouTubePublishing.c"
 	}
 #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 1522 "YouTubePublishing.c"
+#line 1723 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_you_tube_publisher_on_publishing_options_publish (PublishingYouTubeYouTubePublisher* self) {
-	gboolean _tmp0_;
+static void
+publishing_you_tube_you_tube_publisher_on_publishing_options_publish (PublishingYouTubeYouTubePublisher* self)
+{
 #line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
 #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 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 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	if (!_tmp0_) {
+	if (!publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher))) {
 #line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 1538 "YouTubePublishing.c"
+#line 1738 "YouTubePublishing.c"
 	}
 #line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_do_upload (self);
-#line 1542 "YouTubePublishing.c"
+#line 1742 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_you_tube_publisher_on_upload_status_updated (PublishingYouTubeYouTubePublisher* self, gint file_number, gdouble completed_fraction) {
-	gdouble _tmp0_;
+static void
+publishing_you_tube_you_tube_publisher_on_upload_status_updated (PublishingYouTubeYouTubePublisher* self,
+                                                                 gint file_number,
+                                                                 gdouble completed_fraction)
+{
+	SpitPublishingProgressCallback _tmp0_;
+	void* _tmp0__target;
 	SpitPublishingProgressCallback _tmp1_;
 	void* _tmp1__target;
-	gboolean _tmp2_;
-	SpitPublishingProgressCallback _tmp3_;
-	void* _tmp3__target;
-	gint _tmp4_;
-	gdouble _tmp5_;
 #line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
 #line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp0_ = completed_fraction;
-#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_);
+"t complete.", 100.0 * completed_fraction);
 #line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp1_ = self->priv->progress_reporter;
+	_tmp0_ = self->priv->progress_reporter;
 #line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp1__target = self->priv->progress_reporter_target;
+	_tmp0__target = self->priv->progress_reporter_target;
 #line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_vala_assert (_tmp1_ != NULL, "progress_reporter != null");
-#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));
+	_vala_assert (_tmp0_ != NULL, "progress_reporter != null");
 #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	if (!_tmp2_) {
+	if (!publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher))) {
 #line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 1573 "YouTubePublishing.c"
+#line 1769 "YouTubePublishing.c"
 	}
 #line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp3_ = self->priv->progress_reporter;
-#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp3__target = self->priv->progress_reporter_target;
-#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp4_ = file_number;
+	_tmp1_ = self->priv->progress_reporter;
 #line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp5_ = completed_fraction;
+	_tmp1__target = self->priv->progress_reporter_target;
 #line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 1585 "YouTubePublishing.c"
+	_tmp1_ (file_number, completed_fraction, _tmp1__target);
+#line 1777 "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) {
+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 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 1592 "YouTubePublishing.c"
+#line 1788 "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) {
+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 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_on_upload_error ((PublishingYouTubeYouTubePublisher*) self, _sender, err);
-#line 1599 "YouTubePublishing.c"
+#line 1799 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_you_tube_publisher_on_upload_complete (PublishingYouTubeYouTubePublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published) {
-	PublishingRESTSupportBatchUploader* _tmp0_;
+static void
+publishing_you_tube_you_tube_publisher_on_upload_complete (PublishingYouTubeYouTubePublisher* self,
+                                                           PublishingRESTSupportBatchUploader* uploader,
+                                                           gint num_published)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportBatchUploader* _tmp2_;
-	guint _tmp3_;
-	gint _tmp4_;
-	gboolean _tmp5_;
 #line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
 #line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp0_ = uploader;
-#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);
+	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp0_, NULL, FALSE);
 #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 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp2_ = uploader;
+	g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_you_tube_you_tube_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
 #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);
+	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
 #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 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp4_ = num_published;
+	g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_you_tube_you_tube_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
 #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 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));
+"d items published.", num_published);
 #line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	if (!_tmp5_) {
+	if (!publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher))) {
 #line 206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 1636 "YouTubePublishing.c"
+#line 1828 "YouTubePublishing.c"
 	}
 #line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_do_show_success_pane (self);
-#line 1640 "YouTubePublishing.c"
+#line 1832 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_you_tube_publisher_on_upload_error (PublishingYouTubeYouTubePublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err) {
-	PublishingRESTSupportBatchUploader* _tmp0_;
+static void
+publishing_you_tube_you_tube_publisher_on_upload_error (PublishingYouTubeYouTubePublisher* self,
+                                                        PublishingRESTSupportBatchUploader* uploader,
+                                                        GError* err)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	PublishingRESTSupportBatchUploader* _tmp2_;
-	guint _tmp3_;
-	gboolean _tmp4_;
-	GError* _tmp5_;
-	const gchar* _tmp6_;
-	SpitPublishingPluginHost* _tmp7_;
-	GError* _tmp8_;
+	const gchar* _tmp2_;
+	SpitPublishingPluginHost* _tmp3_;
 #line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
 #line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
 #line 213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp0_ = uploader;
-#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);
+	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp0_, NULL, FALSE);
 #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);
+	g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_you_tube_you_tube_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
 #line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp2_ = uploader;
+	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
 #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 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 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));
+	g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_you_tube_you_tube_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
 #line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	if (!_tmp4_) {
+	if (!publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher))) {
 #line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 1676 "YouTubePublishing.c"
+#line 1861 "YouTubePublishing.c"
 	}
 #line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp5_ = err;
-#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp6_ = _tmp5_->message;
+	_tmp2_ = err->message;
 #line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_debug ("YouTubePublishing.vala:219: EVENT: uploader reports upload error = '%s" \
-"'.", _tmp6_);
+"'.", _tmp2_);
 #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));
+	_tmp3_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
 #line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp8_ = err;
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 1690 "YouTubePublishing.c"
+	spit_publishing_plugin_host_post_error (_tmp3_, err);
+#line 1871 "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) {
+static void
+_publishing_you_tube_you_tube_publisher_on_publishing_options_publish_publishing_you_tube_publishing_options_pane_publish (PublishingYouTubePublishingOptionsPane* _sender,
+                                                                                                                           gpointer self)
+{
 #line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_on_publishing_options_publish ((PublishingYouTubeYouTubePublisher*) self);
-#line 1697 "YouTubePublishing.c"
+#line 1881 "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) {
+static void
+_publishing_you_tube_you_tube_publisher_on_publishing_options_logout_publishing_you_tube_publishing_options_pane_logout (PublishingYouTubePublishingOptionsPane* _sender,
+                                                                                                                         gpointer self)
+{
 #line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_on_publishing_options_logout ((PublishingYouTubeYouTubePublisher*) self);
-#line 1704 "YouTubePublishing.c"
+#line 1891 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pane (PublishingYouTubeYouTubePublisher* self) {
+static void
+publishing_you_tube_you_tube_publisher_do_show_publishing_options_pane (PublishingYouTubeYouTubePublisher* self)
+{
 	GtkBuilder* builder = NULL;
 	GtkBuilder* _tmp0_;
 	PublishingYouTubePublishingOptionsPane* opts_pane = NULL;
@@ -1732,7 +1921,7 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa
 	_tmp0_ = gtk_builder_new ();
 #line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	builder = _tmp0_;
-#line 1731 "YouTubePublishing.c"
+#line 1920 "YouTubePublishing.c"
 	{
 		GtkBuilder* _tmp1_;
 #line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1741,12 +1930,12 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa
 		gtk_builder_add_from_resource (_tmp1_, PLUGIN_RESOURCE_PATH "/youtube_publishing_options_pane.ui", &_inner_error_);
 #line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1740 "YouTubePublishing.c"
-			goto __catch20_g_error;
+#line 1929 "YouTubePublishing.c"
+			goto __catch25_g_error;
 		}
 	}
-	goto __finally20;
-	__catch20_g_error:
+	goto __finally25;
+	__catch25_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp2_;
@@ -1781,9 +1970,9 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa
 		_g_object_unref0 (builder);
 #line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 1779 "YouTubePublishing.c"
+#line 1968 "YouTubePublishing.c"
 	}
-	__finally20:
+	__finally25:
 #line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1794,7 +1983,7 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa
 		g_clear_error (&_inner_error_);
 #line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 1792 "YouTubePublishing.c"
+#line 1981 "YouTubePublishing.c"
 	}
 #line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp7_ = self->priv->authenticator;
@@ -1830,43 +2019,48 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa
 	_g_object_unref0 (opts_pane);
 #line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (builder);
-#line 1828 "YouTubePublishing.c"
+#line 2017 "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) {
+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 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 1835 "YouTubePublishing.c"
+#line 2028 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_you_tube_publisher_do_upload (PublishingYouTubeYouTubePublisher* self) {
+static void
+publishing_you_tube_you_tube_publisher_do_upload (PublishingYouTubeYouTubePublisher* self)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	SpitPublishingPluginHost* _tmp1_;
 	SpitPublishingPluginHost* _tmp2_;
 	void* _tmp3_;
 	GDestroyNotify _tmp4_;
 	SpitPublishingProgressCallback _tmp5_;
-	gboolean _tmp6_;
 	SpitPublishingPublishable** publishables = NULL;
-	SpitPublishingPluginHost* _tmp7_;
-	gint _tmp8_;
-	SpitPublishingPublishable** _tmp9_;
+	SpitPublishingPluginHost* _tmp6_;
+	gint _tmp7_;
+	SpitPublishingPublishable** _tmp8_;
 	gint publishables_length1;
 	gint _publishables_size_;
 	PublishingYouTubeUploader* uploader = NULL;
-	GDataYouTubeService* _tmp10_;
+	GDataYouTubeService* _tmp9_;
+	PublishingRESTSupportGoogleSession* _tmp10_;
 	PublishingRESTSupportGoogleSession* _tmp11_;
-	PublishingRESTSupportGoogleSession* _tmp12_;
-	SpitPublishingPublishable** _tmp13_;
-	gint _tmp13__length1;
-	PublishingYouTubePublishingParameters* _tmp14_;
+	SpitPublishingPublishable** _tmp12_;
+	gint _tmp12__length1;
+	PublishingYouTubePublishingParameters* _tmp13_;
+	PublishingYouTubeUploader* _tmp14_;
 	PublishingYouTubeUploader* _tmp15_;
 	PublishingYouTubeUploader* _tmp16_;
 	PublishingYouTubeUploader* _tmp17_;
 	PublishingYouTubeUploader* _tmp18_;
-	PublishingYouTubeUploader* _tmp19_;
 #line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
 #line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1899,64 +2093,64 @@ static void publishing_you_tube_you_tube_publisher_do_upload (PublishingYouTubeY
 #line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = _tmp4_;
 #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 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	if (!_tmp6_) {
+	if (!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"
 		return;
-#line 1901 "YouTubePublishing.c"
+#line 2093 "YouTubePublishing.c"
 	}
 #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));
+	_tmp6_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
 #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp9_ = spit_publishing_plugin_host_get_publishables (_tmp7_, &_tmp8_);
+	_tmp8_ = spit_publishing_plugin_host_get_publishables (_tmp6_, &_tmp7_);
 #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	publishables = _tmp9_;
+	publishables = _tmp8_;
 #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	publishables_length1 = _tmp8_;
+	publishables_length1 = _tmp7_;
 #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishables_size_ = publishables_length1;
 #line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp10_ = self->priv->youtube_service;
+	_tmp9_ = 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));
+	_tmp10_ = 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_;
+	_tmp11_ = _tmp10_;
 #line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp13_ = publishables;
+	_tmp12_ = publishables;
 #line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp13__length1 = publishables_length1;
+	_tmp12__length1 = publishables_length1;
 #line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp14_ = self->priv->publishing_parameters;
+	_tmp13_ = 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_);
+	_tmp14_ = publishing_you_tube_uploader_new (_tmp9_, _tmp11_, _tmp12_, _tmp12__length1, _tmp13_);
 #line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp16_ = _tmp15_;
+	_tmp15_ = _tmp14_;
 #line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_publishing_rest_support_session_unref0 (_tmp12_);
+	_publishing_rest_support_session_unref0 (_tmp11_);
 #line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	uploader = _tmp16_;
+	uploader = _tmp15_;
 #line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp17_ = uploader;
+	_tmp16_ = uploader;
 #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);
+	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 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp18_ = uploader;
+	_tmp17_ = uploader;
 #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);
+	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 269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp19_ = uploader;
+	_tmp18_ = 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);
+	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 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_rest_support_batch_uploader_unref0 (uploader);
 #line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 1949 "YouTubePublishing.c"
+#line 2141 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_you_tube_publisher_do_show_success_pane (PublishingYouTubeYouTubePublisher* self) {
+static void
+publishing_you_tube_you_tube_publisher_do_show_success_pane (PublishingYouTubeYouTubePublisher* self)
+{
 	SpitPublishingPluginHost* _tmp0_;
 	SpitPublishingPluginHost* _tmp1_;
 #line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1971,14 +2165,15 @@ static void publishing_you_tube_you_tube_publisher_do_show_success_pane (Publish
 	_tmp1_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
 #line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	spit_publishing_plugin_host_install_success_pane (_tmp1_);
-#line 1968 "YouTubePublishing.c"
+#line 2162 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_you_tube_publisher_real_do_logout (PublishingRESTSupportGooglePublisher* base) {
+static void
+publishing_you_tube_you_tube_publisher_real_do_logout (PublishingRESTSupportGooglePublisher* base)
+{
 	PublishingYouTubeYouTubePublisher * self;
 	SpitPublishingAuthenticator* _tmp0_;
-	gboolean _tmp1_;
 #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 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1986,26 +2181,26 @@ static void publishing_you_tube_you_tube_publisher_real_do_logout (PublishingRES
 #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 1986 "YouTubePublishing.c"
+	if (spit_publishing_authenticator_can_logout (_tmp0_)) {
+#line 2179 "YouTubePublishing.c"
+		SpitPublishingAuthenticator* _tmp1_;
 		SpitPublishingAuthenticator* _tmp2_;
-		SpitPublishingAuthenticator* _tmp3_;
 #line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp2_ = self->priv->authenticator;
+		_tmp1_ = self->priv->authenticator;
 #line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		spit_publishing_authenticator_logout (_tmp2_);
+		spit_publishing_authenticator_logout (_tmp1_);
 #line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp3_ = self->priv->authenticator;
+		_tmp2_ = self->priv->authenticator;
 #line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		spit_publishing_authenticator_authenticate (_tmp3_);
-#line 1997 "YouTubePublishing.c"
+		spit_publishing_authenticator_authenticate (_tmp2_);
+#line 2190 "YouTubePublishing.c"
 	}
 }
 
 
-static SpitPublishingAuthenticator* publishing_you_tube_you_tube_publisher_real_get_authenticator (PublishingRESTSupportGooglePublisher* base) {
+static SpitPublishingAuthenticator*
+publishing_you_tube_you_tube_publisher_real_get_authenticator (PublishingRESTSupportGooglePublisher* base)
+{
 	PublishingYouTubeYouTubePublisher * self;
 	SpitPublishingAuthenticator* result = NULL;
 	SpitPublishingAuthenticator* _tmp0_;
@@ -2017,7 +2212,7 @@ static SpitPublishingAuthenticator* publishing_you_tube_you_tube_publisher_real_
 	_tmp0_ = self->priv->authenticator;
 #line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 2014 "YouTubePublishing.c"
+#line 2209 "YouTubePublishing.c"
 		PublishingAuthenticatorFactory* _tmp1_;
 		PublishingAuthenticatorFactory* _tmp2_;
 		SpitPublishingPluginHost* _tmp3_;
@@ -2036,7 +2231,7 @@ static SpitPublishingAuthenticator* publishing_you_tube_you_tube_publisher_real_
 		self->priv->authenticator = _tmp4_;
 #line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_g_object_unref0 (_tmp2_);
-#line 2033 "YouTubePublishing.c"
+#line 2228 "YouTubePublishing.c"
 	}
 #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp5_ = self->priv->authenticator;
@@ -2046,11 +2241,13 @@ static SpitPublishingAuthenticator* publishing_you_tube_you_tube_publisher_real_
 	result = _tmp6_;
 #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 2043 "YouTubePublishing.c"
+#line 2238 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_you_tube_publisher_class_init (PublishingYouTubeYouTubePublisherClass * klass) {
+static void
+publishing_you_tube_you_tube_publisher_class_init (PublishingYouTubeYouTubePublisherClass * klass)
+{
 #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 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2069,18 +2266,22 @@ static void publishing_you_tube_you_tube_publisher_class_init (PublishingYouTube
 	((PublishingRESTSupportGooglePublisherClass *) klass)->get_authenticator = (SpitPublishingAuthenticator* (*) (PublishingRESTSupportGooglePublisher *)) 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 2066 "YouTubePublishing.c"
+#line 2263 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_you_tube_publisher_instance_init (PublishingYouTubeYouTubePublisher * self) {
+static void
+publishing_you_tube_you_tube_publisher_instance_init (PublishingYouTubeYouTubePublisher * self)
+{
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv = PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_GET_PRIVATE (self);
-#line 2073 "YouTubePublishing.c"
+#line 2272 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_you_tube_publisher_finalize (GObject * obj) {
+static void
+publishing_you_tube_you_tube_publisher_finalize (GObject * obj)
+{
 	PublishingYouTubeYouTubePublisher * self;
 #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);
@@ -2100,11 +2301,13 @@ static void publishing_you_tube_you_tube_publisher_finalize (GObject * obj) {
 	_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 2097 "YouTubePublishing.c"
+#line 2298 "YouTubePublishing.c"
 }
 
 
-GType publishing_you_tube_you_tube_publisher_get_type (void) {
+GType
+publishing_you_tube_you_tube_publisher_get_type (void)
+{
 	static volatile gsize publishing_you_tube_you_tube_publisher_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_you_tube_you_tube_publisher_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingYouTubeYouTubePublisherClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_you_tube_you_tube_publisher_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingYouTubeYouTubePublisher), 0, (GInstanceInitFunc) publishing_you_tube_you_tube_publisher_instance_init, NULL };
@@ -2116,80 +2319,88 @@ GType publishing_you_tube_you_tube_publisher_get_type (void) {
 }
 
 
-static gpointer _publishing_you_tube_publishing_parameters_ref0 (gpointer self) {
+static gpointer
+_publishing_you_tube_publishing_parameters_ref0 (gpointer self)
+{
 #line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self ? publishing_you_tube_publishing_parameters_ref (self) : NULL;
-#line 2116 "YouTubePublishing.c"
+#line 2321 "YouTubePublishing.c"
 }
 
 
-static gpointer _publishing_you_tube_publishing_options_pane_privacy_description_ref0 (gpointer self) {
+static gpointer
+_publishing_you_tube_publishing_options_pane_privacy_description_ref0 (gpointer self)
+{
 #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 2123 "YouTubePublishing.c"
+#line 2330 "YouTubePublishing.c"
 }
 
 
-static void _publishing_you_tube_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_you_tube_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                   gpointer self)
+{
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_publishing_options_pane_on_logout_clicked ((PublishingYouTubePublishingOptionsPane*) self);
-#line 2130 "YouTubePublishing.c"
+#line 2340 "YouTubePublishing.c"
 }
 
 
-static void _publishing_you_tube_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_publishing_you_tube_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                    gpointer self)
+{
 #line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_publishing_options_pane_on_publish_clicked ((PublishingYouTubePublishingOptionsPane*) self);
-#line 2137 "YouTubePublishing.c"
+#line 2350 "YouTubePublishing.c"
 }
 
 
-PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_pane_construct (GType object_type, 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)
+{
 	PublishingYouTubePublishingOptionsPane * self = NULL;
 	gint _tmp0_;
 	PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp1_;
 	PublishingYouTubePublishingParameters* _tmp2_;
-	PublishingYouTubePublishingParameters* _tmp3_;
-	GtkBuilder* _tmp4_;
-	GtkBuilder* _tmp5_;
+	GtkBuilder* _tmp3_;
+	GSList* _tmp4_;
+	GSList* _tmp5_;
 	GtkBuilder* _tmp6_;
-	GtkBuilder* _tmp7_;
-	GSList* _tmp8_;
-	GSList* _tmp9_;
-	guint _tmp10_;
-	GtkBuilder* _tmp11_;
-	GObject* _tmp12_;
-	GtkLabel* _tmp13_;
-	GtkBuilder* _tmp14_;
-	GObject* _tmp15_;
-	GtkComboBoxText* _tmp16_;
-	GtkBuilder* _tmp17_;
-	GObject* _tmp18_;
-	GtkButton* _tmp19_;
-	GtkBuilder* _tmp20_;
-	GObject* _tmp21_;
-	GtkButton* _tmp22_;
-	GtkBuilder* _tmp23_;
-	GObject* _tmp24_;
-	GtkBox* _tmp25_;
-	GtkBuilder* _tmp26_;
-	GObject* _tmp27_;
+	GObject* _tmp7_;
+	GtkLabel* _tmp8_;
+	GtkBuilder* _tmp9_;
+	GObject* _tmp10_;
+	GtkComboBoxText* _tmp11_;
+	GtkBuilder* _tmp12_;
+	GObject* _tmp13_;
+	GtkButton* _tmp14_;
+	GtkBuilder* _tmp15_;
+	GObject* _tmp16_;
+	GtkButton* _tmp17_;
+	GtkBuilder* _tmp18_;
+	GObject* _tmp19_;
+	GtkBox* _tmp20_;
+	GtkBuilder* _tmp21_;
+	GObject* _tmp22_;
+	GtkLabel* _tmp23_;
 	GtkLabel* _tmp28_;
-	SpitPublishingAuthenticator* _tmp29_;
-	gboolean _tmp30_;
-	GtkLabel* _tmp35_;
-	PublishingYouTubePublishingParameters* _tmp36_;
-	gchar* _tmp37_;
-	gchar* _tmp38_;
-	gchar* _tmp39_;
-	gchar* _tmp40_;
-	PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp41_;
-	gint _tmp41__length1;
-	GtkComboBoxText* _tmp46_;
-	GtkLabel* _tmp47_;
-	GtkComboBoxText* _tmp48_;
-	GtkButton* _tmp49_;
-	GtkButton* _tmp50_;
+	gchar* _tmp29_;
+	gchar* _tmp30_;
+	gchar* _tmp31_;
+	gchar* _tmp32_;
+	PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp33_;
+	gint _tmp33__length1;
+	GtkComboBoxText* _tmp38_;
+	GtkLabel* _tmp39_;
+	GtkComboBoxText* _tmp40_;
+	GtkButton* _tmp41_;
+	GtkButton* _tmp42_;
 #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"
@@ -2211,219 +2422,209 @@ PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_p
 #line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->_privacy_descriptions_size_ = self->priv->privacy_descriptions_length1;
 #line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp2_ = publishing_parameters;
-#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp3_ = _publishing_you_tube_publishing_parameters_ref0 (_tmp2_);
+	_tmp2_ = _publishing_you_tube_publishing_parameters_ref0 (publishing_parameters);
 #line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_you_tube_publishing_parameters_unref0 (self->priv->publishing_parameters);
 #line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	self->priv->publishing_parameters = _tmp3_;
-#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp4_ = builder;
+	self->priv->publishing_parameters = _tmp2_;
 #line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp5_ = _g_object_ref0 (_tmp4_);
+	_tmp3_ = _g_object_ref0 (builder);
 #line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (self->priv->builder);
 #line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	self->priv->builder = _tmp5_;
+	self->priv->builder = _tmp3_;
 #line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp6_ = builder;
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_vala_assert (_tmp6_ != NULL, "builder != null");
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp7_ = builder;
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp8_ = gtk_builder_get_objects (_tmp7_);
+	_vala_assert (builder != NULL, "builder != null");
 #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp9_ = _tmp8_;
+	_tmp4_ = gtk_builder_get_objects (builder);
 #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp10_ = g_slist_length (_tmp9_);
+	_tmp5_ = _tmp4_;
 #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_vala_assert (_tmp10_ > ((guint) 0), "builder.get_objects().length() > 0");
+	_vala_assert (g_slist_length (_tmp5_) > ((guint) 0), "builder.get_objects().length() > 0");
 #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_slist_free0 (_tmp9_);
+	_g_slist_free0 (_tmp5_);
 #line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp11_ = self->priv->builder;
+	_tmp6_ = self->priv->builder;
 #line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp12_ = gtk_builder_get_object (_tmp11_, "login_identity_label");
+	_tmp7_ = gtk_builder_get_object (_tmp6_, "login_identity_label");
 #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);
+	_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp7_) : NULL);
 #line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (self->priv->login_identity_label);
 #line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	self->priv->login_identity_label = _tmp13_;
+	self->priv->login_identity_label = _tmp8_;
 #line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp14_ = self->priv->builder;
+	_tmp9_ = self->priv->builder;
 #line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp15_ = gtk_builder_get_object (_tmp14_, "privacy_combo");
+	_tmp10_ = gtk_builder_get_object (_tmp9_, "privacy_combo");
 #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);
+	_tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp10_) : NULL);
 #line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (self->priv->privacy_combo);
 #line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	self->priv->privacy_combo = _tmp16_;
+	self->priv->privacy_combo = _tmp11_;
 #line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp17_ = self->priv->builder;
+	_tmp12_ = self->priv->builder;
 #line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp18_ = gtk_builder_get_object (_tmp17_, "publish_button");
+	_tmp13_ = gtk_builder_get_object (_tmp12_, "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);
+	_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, gtk_button_get_type ()) ? ((GtkButton*) _tmp13_) : 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_;
+	self->priv->publish_button = _tmp14_;
 #line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp20_ = self->priv->builder;
+	_tmp15_ = self->priv->builder;
 #line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp21_ = gtk_builder_get_object (_tmp20_, "logout_button");
+	_tmp16_ = gtk_builder_get_object (_tmp15_, "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);
+	_tmp17_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, gtk_button_get_type ()) ? ((GtkButton*) _tmp16_) : NULL);
 #line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (self->priv->logout_button);
 #line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	self->priv->logout_button = _tmp22_;
+	self->priv->logout_button = _tmp17_;
 #line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp23_ = self->priv->builder;
+	_tmp18_ = self->priv->builder;
 #line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp24_ = gtk_builder_get_object (_tmp23_, "youtube_pane_widget");
+	_tmp19_ = gtk_builder_get_object (_tmp18_, "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);
+	_tmp20_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, gtk_box_get_type ()) ? ((GtkBox*) _tmp19_) : NULL);
 #line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (self->priv->pane_widget);
 #line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	self->priv->pane_widget = _tmp25_;
+	self->priv->pane_widget = _tmp20_;
 #line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp26_ = self->priv->builder;
+	_tmp21_ = self->priv->builder;
 #line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp27_ = gtk_builder_get_object (_tmp26_, "privacy_label");
+	_tmp22_ = gtk_builder_get_object (_tmp21_, "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);
+	_tmp23_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp22_) : NULL);
 #line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (self->priv->privacy_label);
 #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;
+	self->priv->privacy_label = _tmp23_;
 #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 2305 "YouTubePublishing.c"
-		GtkButton* _tmp31_;
-		GtkContainer* _tmp32_;
-		GtkContainer* _tmp33_;
-		GtkButton* _tmp34_;
+	if (!spit_publishing_authenticator_can_logout (authenticator)) {
+#line 2502 "YouTubePublishing.c"
+		GtkButton* _tmp24_;
+		GtkContainer* _tmp25_;
+		GtkContainer* _tmp26_;
+		GtkButton* _tmp27_;
 #line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp31_ = self->priv->logout_button;
+		_tmp24_ = 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));
+		_tmp25_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget));
 #line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp33_ = _tmp32_;
+		_tmp26_ = _tmp25_;
 #line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp34_ = self->priv->logout_button;
+		_tmp27_ = 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 2320 "YouTubePublishing.c"
+		gtk_container_remove (_tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget));
+#line 2517 "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_ = publishing_parameters;
+	_tmp28_ = self->priv->login_identity_label;
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp37_ = publishing_you_tube_publishing_parameters_get_user_name (_tmp36_);
+	_tmp29_ = publishing_you_tube_publishing_parameters_get_user_name (publishing_parameters);
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp38_ = _tmp37_;
+	_tmp30_ = _tmp29_;
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp39_ = g_strdup_printf (_ ("You are logged into YouTube as %s."), _tmp38_);
+	_tmp31_ = g_strdup_printf (_ ("You are logged into YouTube as %s."), _tmp30_);
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp40_ = _tmp39_;
+	_tmp32_ = _tmp31_;
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	gtk_label_set_label (_tmp35_, _tmp40_);
+	gtk_label_set_label (_tmp28_, _tmp32_);
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (_tmp40_);
+	_g_free0 (_tmp32_);
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (_tmp38_);
+	_g_free0 (_tmp30_);
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp41_ = self->priv->privacy_descriptions;
+	_tmp33_ = self->priv->privacy_descriptions;
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp41__length1 = self->priv->privacy_descriptions_length1;
-#line 2344 "YouTubePublishing.c"
+	_tmp33__length1 = self->priv->privacy_descriptions_length1;
+#line 2539 "YouTubePublishing.c"
 	{
 		PublishingYouTubePublishingOptionsPanePrivacyDescription** desc_collection = NULL;
 		gint desc_collection_length1 = 0;
 		gint _desc_collection_size_ = 0;
 		gint desc_it = 0;
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		desc_collection = _tmp41_;
+		desc_collection = _tmp33_;
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		desc_collection_length1 = _tmp41__length1;
+		desc_collection_length1 = _tmp33__length1;
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		for (desc_it = 0; desc_it < _tmp41__length1; desc_it = desc_it + 1) {
-#line 2356 "YouTubePublishing.c"
-			PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp42_;
+		for (desc_it = 0; desc_it < _tmp33__length1; desc_it = desc_it + 1) {
+#line 2551 "YouTubePublishing.c"
+			PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp34_;
 			PublishingYouTubePublishingOptionsPanePrivacyDescription* desc = NULL;
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_tmp42_ = _publishing_you_tube_publishing_options_pane_privacy_description_ref0 (desc_collection[desc_it]);
+			_tmp34_ = _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 = _tmp42_;
-#line 2363 "YouTubePublishing.c"
+			desc = _tmp34_;
+#line 2558 "YouTubePublishing.c"
 			{
-				GtkComboBoxText* _tmp43_;
-				PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp44_;
-				const gchar* _tmp45_;
+				GtkComboBoxText* _tmp35_;
+				PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp36_;
+				const gchar* _tmp37_;
 #line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				_tmp43_ = self->priv->privacy_combo;
+				_tmp35_ = self->priv->privacy_combo;
 #line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				_tmp44_ = desc;
+				_tmp36_ = desc;
 #line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				_tmp45_ = _tmp44_->description;
+				_tmp37_ = _tmp36_->description;
 #line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				gtk_combo_box_text_append_text (_tmp43_, _tmp45_);
+				gtk_combo_box_text_append_text (_tmp35_, _tmp37_);
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 				_publishing_you_tube_publishing_options_pane_privacy_description_unref0 (desc);
-#line 2378 "YouTubePublishing.c"
+#line 2573 "YouTubePublishing.c"
 			}
 		}
 	}
 #line 351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp46_ = self->priv->privacy_combo;
+	_tmp38_ = 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 (_tmp46_, gtk_combo_box_get_type (), GtkComboBox), (gint) PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PUBLIC);
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_combo_box_get_type (), GtkComboBox), (gint) PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PUBLIC);
 #line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp47_ = self->priv->privacy_label;
+	_tmp39_ = self->priv->privacy_label;
 #line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp48_ = self->priv->privacy_combo;
+	_tmp40_ = self->priv->privacy_combo;
 #line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	gtk_label_set_mnemonic_widget (_tmp47_, G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget));
+	gtk_label_set_mnemonic_widget (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget));
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp49_ = self->priv->logout_button;
+	_tmp41_ = self->priv->logout_button;
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_connect_object (_tmp49_, "clicked", (GCallback) _publishing_you_tube_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
+	g_signal_connect_object (_tmp41_, "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"
-	_tmp50_ = self->priv->publish_button;
+	_tmp42_ = self->priv->publish_button;
 #line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_connect_object (_tmp50_, "clicked", (GCallback) _publishing_you_tube_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
+	g_signal_connect_object (_tmp42_, "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 2402 "YouTubePublishing.c"
+#line 2597 "YouTubePublishing.c"
 }
 
 
-PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_pane_new (SpitPublishingAuthenticator* authenticator, SpitPublishingPluginHost* host, GtkBuilder* builder, PublishingYouTubePublishingParameters* publishing_parameters) {
+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"
+#line 2609 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_publishing_options_pane_on_publish_clicked (PublishingYouTubePublishingOptionsPane* self) {
+static void
+publishing_you_tube_publishing_options_pane_on_publish_clicked (PublishingYouTubePublishingOptionsPane* self)
+{
 	PublishingYouTubePublishingParameters* _tmp0_;
 	PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp1_;
 	gint _tmp1__length1;
 	GtkComboBoxText* _tmp2_;
-	gint _tmp3_;
-	PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp4_;
-	PublishingYouTubePrivacySetting _tmp5_;
+	PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp3_;
+	PublishingYouTubePrivacySetting _tmp4_;
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2435,29 +2636,31 @@ static void publishing_you_tube_publishing_options_pane_on_publish_clicked (Publ
 #line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp2_ = self->priv->privacy_combo;
 #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));
+	_tmp3_ = _tmp1_[gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox))];
 #line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp4_ = _tmp1_[_tmp3_];
+	_tmp4_ = _tmp3_->privacy_setting;
 #line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp5_ = _tmp4_->privacy_setting;
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	publishing_you_tube_publishing_parameters_set_privacy (_tmp0_, _tmp5_);
+	publishing_you_tube_publishing_parameters_set_privacy (_tmp0_, _tmp4_);
 #line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_signal_emit (self, publishing_you_tube_publishing_options_pane_signals[PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0);
-#line 2441 "YouTubePublishing.c"
+#line 2640 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_publishing_options_pane_on_logout_clicked (PublishingYouTubePublishingOptionsPane* self) {
+static void
+publishing_you_tube_publishing_options_pane_on_logout_clicked (PublishingYouTubePublishingOptionsPane* self)
+{
 #line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_signal_emit (self, publishing_you_tube_publishing_options_pane_signals[PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
-#line 2450 "YouTubePublishing.c"
+#line 2651 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_publishing_options_pane_update_publish_button_sensitivity (PublishingYouTubePublishingOptionsPane* self) {
+static void
+publishing_you_tube_publishing_options_pane_update_publish_button_sensitivity (PublishingYouTubePublishingOptionsPane* self)
+{
 	GtkButton* _tmp0_;
 #line 369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_OPTIONS_PANE (self));
@@ -2465,62 +2668,80 @@ static void publishing_you_tube_publishing_options_pane_update_publish_button_se
 	_tmp0_ = self->priv->publish_button;
 #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 2462 "YouTubePublishing.c"
+#line 2665 "YouTubePublishing.c"
 }
 
 
-static void _vala_array_add32 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) {
+static void
+_vala_array_add35 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array,
+                   int* length,
+                   int* size,
+                   PublishingYouTubePublishingOptionsPanePrivacyDescription* value)
+{
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if ((*length) == (*size)) {
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*array = g_renew (PublishingYouTubePublishingOptionsPanePrivacyDescription*, *array, (*size) + 1);
-#line 2473 "YouTubePublishing.c"
+#line 2681 "YouTubePublishing.c"
 	}
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	(*array)[(*length)++] = value;
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	(*array)[*length] = NULL;
-#line 2479 "YouTubePublishing.c"
+#line 2687 "YouTubePublishing.c"
 }
 
 
-static void _vala_array_add33 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) {
+static void
+_vala_array_add36 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array,
+                   int* length,
+                   int* size,
+                   PublishingYouTubePublishingOptionsPanePrivacyDescription* value)
+{
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if ((*length) == (*size)) {
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*array = g_renew (PublishingYouTubePublishingOptionsPanePrivacyDescription*, *array, (*size) + 1);
-#line 2490 "YouTubePublishing.c"
+#line 2703 "YouTubePublishing.c"
 	}
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	(*array)[(*length)++] = value;
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	(*array)[*length] = NULL;
-#line 2496 "YouTubePublishing.c"
+#line 2709 "YouTubePublishing.c"
 }
 
 
-static void _vala_array_add34 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) {
+static void
+_vala_array_add37 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array,
+                   int* length,
+                   int* size,
+                   PublishingYouTubePublishingOptionsPanePrivacyDescription* value)
+{
 #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if ((*length) == (*size)) {
 #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*array = g_renew (PublishingYouTubePublishingOptionsPanePrivacyDescription*, *array, (*size) + 1);
-#line 2507 "YouTubePublishing.c"
+#line 2725 "YouTubePublishing.c"
 	}
 #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	(*array)[(*length)++] = value;
 #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	(*array)[*length] = NULL;
-#line 2513 "YouTubePublishing.c"
+#line 2731 "YouTubePublishing.c"
 }
 
 
-static PublishingYouTubePublishingOptionsPanePrivacyDescription** publishing_you_tube_publishing_options_pane_create_privacy_descriptions (PublishingYouTubePublishingOptionsPane* self, int* result_length1) {
+static PublishingYouTubePublishingOptionsPanePrivacyDescription**
+publishing_you_tube_publishing_options_pane_create_privacy_descriptions (PublishingYouTubePublishingOptionsPane* self,
+                                                                         int* result_length1)
+{
 	PublishingYouTubePublishingOptionsPanePrivacyDescription** result = NULL;
 	PublishingYouTubePublishingOptionsPanePrivacyDescription** _result_ = NULL;
 	PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp0_;
@@ -2554,7 +2775,7 @@ static PublishingYouTubePublishingOptionsPanePrivacyDescription** publishing_you
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp2_ = publishing_you_tube_publishing_options_pane_privacy_description_new (_ ("Public listed"), PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PUBLIC);
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_vala_array_add32 (&_result_, &_result__length1, &__result__size_, _tmp2_);
+	_vala_array_add35 (&_result_, &_result__length1, &__result__size_, _tmp2_);
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp3_ = _result_;
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2562,7 +2783,7 @@ static PublishingYouTubePublishingOptionsPanePrivacyDescription** publishing_you
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp4_ = publishing_you_tube_publishing_options_pane_privacy_description_new (_ ("Public unlisted"), PUBLISHING_YOU_TUBE_PRIVACY_SETTING_UNLISTED);
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_vala_array_add33 (&_result_, &_result__length1, &__result__size_, _tmp4_);
+	_vala_array_add36 (&_result_, &_result__length1, &__result__size_, _tmp4_);
 #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp5_ = _result_;
 #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2570,7 +2791,7 @@ static PublishingYouTubePublishingOptionsPanePrivacyDescription** publishing_you
 #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp6_ = publishing_you_tube_publishing_options_pane_privacy_description_new (_ ("Private"), PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PRIVATE);
 #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_vala_array_add34 (&_result_, &_result__length1, &__result__size_, _tmp6_);
+	_vala_array_add37 (&_result_, &_result__length1, &__result__size_, _tmp6_);
 #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp7_ = _result_;
 #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2579,17 +2800,19 @@ static PublishingYouTubePublishingOptionsPanePrivacyDescription** publishing_you
 	if (result_length1) {
 #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*result_length1 = _tmp7__length1;
-#line 2576 "YouTubePublishing.c"
+#line 2797 "YouTubePublishing.c"
 	}
 #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	result = _tmp7_;
 #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 2582 "YouTubePublishing.c"
+#line 2803 "YouTubePublishing.c"
 }
 
 
-static GtkWidget* publishing_you_tube_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base) {
+static GtkWidget*
+publishing_you_tube_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base)
+{
 	PublishingYouTubePublishingOptionsPane * self;
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_;
@@ -2609,11 +2832,13 @@ static GtkWidget* publishing_you_tube_publishing_options_pane_real_get_widget (S
 	result = _tmp2_;
 #line 385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 2606 "YouTubePublishing.c"
+#line 2829 "YouTubePublishing.c"
 }
 
 
-static SpitPublishingDialogPaneGeometryOptions publishing_you_tube_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
+static SpitPublishingDialogPaneGeometryOptions
+publishing_you_tube_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base)
+{
 	PublishingYouTubePublishingOptionsPane * self;
 	SpitPublishingDialogPaneGeometryOptions result = 0;
 #line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2622,160 +2847,190 @@ static SpitPublishingDialogPaneGeometryOptions publishing_you_tube_publishing_op
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
 #line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 2619 "YouTubePublishing.c"
+#line 2844 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
+static void
+publishing_you_tube_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base)
+{
 	PublishingYouTubePublishingOptionsPane * self;
 #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 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 2629 "YouTubePublishing.c"
+#line 2856 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
+static void
+publishing_you_tube_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base)
+{
 	PublishingYouTubePublishingOptionsPane * self;
 #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 2637 "YouTubePublishing.c"
+#line 2866 "YouTubePublishing.c"
 }
 
 
-static PublishingYouTubePublishingOptionsPanePrivacyDescription* publishing_you_tube_publishing_options_pane_privacy_description_construct (GType object_type, 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)
+{
 	PublishingYouTubePublishingOptionsPanePrivacyDescription* self = NULL;
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-	PublishingYouTubePrivacySetting _tmp2_;
+	gchar* _tmp0_;
 #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (description != NULL, NULL);
 #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = (PublishingYouTubePublishingOptionsPanePrivacyDescription*) g_type_create_instance (object_type);
 #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp0_ = description;
-#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (description);
 #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_free0 (self->description);
 #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	self->description = _tmp1_;
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp2_ = privacy_setting;
+	self->description = _tmp0_;
 #line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	self->privacy_setting = _tmp2_;
+	self->privacy_setting = privacy_setting;
 #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self;
-#line 2664 "YouTubePublishing.c"
+#line 2891 "YouTubePublishing.c"
 }
 
 
-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_new (const gchar* description,
+                                                                     PublishingYouTubePrivacySetting privacy_setting)
+{
 #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 2671 "YouTubePublishing.c"
+#line 2901 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_publishing_options_pane_value_privacy_description_init (GValue* value) {
+static void
+publishing_you_tube_publishing_options_pane_value_privacy_description_init (GValue* value)
+{
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 2678 "YouTubePublishing.c"
+#line 2910 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_publishing_options_pane_value_privacy_description_free_value (GValue* value) {
+static void
+publishing_you_tube_publishing_options_pane_value_privacy_description_free_value (GValue* value)
+{
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (value->data[0].v_pointer) {
 #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 2687 "YouTubePublishing.c"
+#line 2921 "YouTubePublishing.c"
 	}
 }
 
 
-static void publishing_you_tube_publishing_options_pane_value_privacy_description_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_you_tube_publishing_options_pane_value_privacy_description_copy_value (const GValue* src_value,
+                                                                                  GValue* dest_value)
+{
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (src_value->data[0].v_pointer) {
 #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 2697 "YouTubePublishing.c"
+#line 2934 "YouTubePublishing.c"
 	} else {
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2701 "YouTubePublishing.c"
+#line 2938 "YouTubePublishing.c"
 	}
 }
 
 
-static gpointer publishing_you_tube_publishing_options_pane_value_privacy_description_peek_pointer (const GValue* value) {
+static gpointer
+publishing_you_tube_publishing_options_pane_value_privacy_description_peek_pointer (const GValue* value)
+{
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return value->data[0].v_pointer;
-#line 2709 "YouTubePublishing.c"
+#line 2948 "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) {
+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 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 2716 "YouTubePublishing.c"
+#line 2960 "YouTubePublishing.c"
 		PublishingYouTubePublishingOptionsPanePrivacyDescription * object;
 		object = collect_values[0].v_pointer;
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #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 2723 "YouTubePublishing.c"
+#line 2967 "YouTubePublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #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 2727 "YouTubePublishing.c"
+#line 2971 "YouTubePublishing.c"
 		}
 #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 2731 "YouTubePublishing.c"
+#line 2975 "YouTubePublishing.c"
 	} else {
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 2735 "YouTubePublishing.c"
+#line 2979 "YouTubePublishing.c"
 	}
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return NULL;
-#line 2739 "YouTubePublishing.c"
+#line 2983 "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) {
+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 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (!object_p) {
 #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 2750 "YouTubePublishing.c"
+#line 2999 "YouTubePublishing.c"
 	}
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*object_p = NULL;
-#line 2756 "YouTubePublishing.c"
+#line 3005 "YouTubePublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2760 "YouTubePublishing.c"
+#line 3009 "YouTubePublishing.c"
 	} else {
 #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 2764 "YouTubePublishing.c"
+#line 3013 "YouTubePublishing.c"
 	}
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return NULL;
-#line 2768 "YouTubePublishing.c"
+#line 3017 "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) {
+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 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);
@@ -2785,20 +3040,25 @@ static GParamSpec* publishing_you_tube_publishing_options_pane_param_spec_privac
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 2782 "YouTubePublishing.c"
+#line 3037 "YouTubePublishing.c"
 }
 
 
-static gpointer publishing_you_tube_publishing_options_pane_value_get_privacy_description (const GValue* value) {
+static gpointer
+publishing_you_tube_publishing_options_pane_value_get_privacy_description (const GValue* value)
+{
 #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 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return value->data[0].v_pointer;
-#line 2791 "YouTubePublishing.c"
+#line 3048 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_publishing_options_pane_value_set_privacy_description (GValue* value, gpointer v_object) {
+static void
+publishing_you_tube_publishing_options_pane_value_set_privacy_description (GValue* value,
+                                                                           gpointer v_object)
+{
 	PublishingYouTubePublishingOptionsPanePrivacyDescription * old;
 #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));
@@ -2814,22 +3074,25 @@ static void publishing_you_tube_publishing_options_pane_value_set_privacy_descri
 		value->data[0].v_pointer = v_object;
 #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 2811 "YouTubePublishing.c"
+#line 3071 "YouTubePublishing.c"
 	} else {
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 2815 "YouTubePublishing.c"
+#line 3075 "YouTubePublishing.c"
 	}
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (old) {
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_you_tube_publishing_options_pane_privacy_description_unref (old);
-#line 2821 "YouTubePublishing.c"
+#line 3081 "YouTubePublishing.c"
 	}
 }
 
 
-static void publishing_you_tube_publishing_options_pane_value_take_privacy_description (GValue* value, gpointer v_object) {
+static void
+publishing_you_tube_publishing_options_pane_value_take_privacy_description (GValue* value,
+                                                                            gpointer v_object)
+{
 	PublishingYouTubePublishingOptionsPanePrivacyDescription * old;
 #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));
@@ -2843,38 +3106,44 @@ static void publishing_you_tube_publishing_options_pane_value_take_privacy_descr
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 2840 "YouTubePublishing.c"
+#line 3103 "YouTubePublishing.c"
 	} else {
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 2844 "YouTubePublishing.c"
+#line 3107 "YouTubePublishing.c"
 	}
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (old) {
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_you_tube_publishing_options_pane_privacy_description_unref (old);
-#line 2850 "YouTubePublishing.c"
+#line 3113 "YouTubePublishing.c"
 	}
 }
 
 
-static void publishing_you_tube_publishing_options_pane_privacy_description_class_init (PublishingYouTubePublishingOptionsPanePrivacyDescriptionClass * klass) {
+static void
+publishing_you_tube_publishing_options_pane_privacy_description_class_init (PublishingYouTubePublishingOptionsPanePrivacyDescriptionClass * klass)
+{
 #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 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	((PublishingYouTubePublishingOptionsPanePrivacyDescriptionClass *) klass)->finalize = publishing_you_tube_publishing_options_pane_privacy_description_finalize;
-#line 2860 "YouTubePublishing.c"
+#line 3125 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_publishing_options_pane_privacy_description_instance_init (PublishingYouTubePublishingOptionsPanePrivacyDescription * self) {
+static void
+publishing_you_tube_publishing_options_pane_privacy_description_instance_init (PublishingYouTubePublishingOptionsPanePrivacyDescription * self)
+{
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->ref_count = 1;
-#line 2867 "YouTubePublishing.c"
+#line 3134 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_publishing_options_pane_privacy_description_finalize (PublishingYouTubePublishingOptionsPanePrivacyDescription * obj) {
+static void
+publishing_you_tube_publishing_options_pane_privacy_description_finalize (PublishingYouTubePublishingOptionsPanePrivacyDescription * obj)
+{
 	PublishingYouTubePublishingOptionsPanePrivacyDescription * self;
 #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);
@@ -2882,11 +3151,13 @@ static void publishing_you_tube_publishing_options_pane_privacy_description_fina
 	g_signal_handlers_destroy (self);
 #line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_free0 (self->description);
-#line 2879 "YouTubePublishing.c"
+#line 3148 "YouTubePublishing.c"
 }
 
 
-static GType publishing_you_tube_publishing_options_pane_privacy_description_get_type (void) {
+static GType
+publishing_you_tube_publishing_options_pane_privacy_description_get_type (void)
+{
 	static volatile gsize publishing_you_tube_publishing_options_pane_privacy_description_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_you_tube_publishing_options_pane_privacy_description_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { publishing_you_tube_publishing_options_pane_value_privacy_description_init, publishing_you_tube_publishing_options_pane_value_privacy_description_free_value, publishing_you_tube_publishing_options_pane_value_privacy_description_copy_value, publishing_you_tube_publishing_options_pane_value_privacy_description_peek_pointer, "p", publishing_you_tube_publishing_options_pane_value_privacy_description_collect_value, "p", publishing_you_tube_publishing_options_pane_value_privacy_description_lcopy_value };
@@ -2900,18 +3171,22 @@ static GType publishing_you_tube_publishing_options_pane_privacy_description_get
 }
 
 
-static gpointer publishing_you_tube_publishing_options_pane_privacy_description_ref (gpointer instance) {
+static gpointer
+publishing_you_tube_publishing_options_pane_privacy_description_ref (gpointer instance)
+{
 	PublishingYouTubePublishingOptionsPanePrivacyDescription * self;
 	self = instance;
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return instance;
-#line 2904 "YouTubePublishing.c"
+#line 3177 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_publishing_options_pane_privacy_description_unref (gpointer instance) {
+static void
+publishing_you_tube_publishing_options_pane_privacy_description_unref (gpointer instance)
+{
 	PublishingYouTubePublishingOptionsPanePrivacyDescription * self;
 	self = instance;
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2920,12 +3195,14 @@ static void publishing_you_tube_publishing_options_pane_privacy_description_unre
 		PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_PRIVACY_DESCRIPTION_GET_CLASS (self)->finalize (self);
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2917 "YouTubePublishing.c"
+#line 3192 "YouTubePublishing.c"
 	}
 }
 
 
-static void publishing_you_tube_publishing_options_pane_class_init (PublishingYouTubePublishingOptionsPaneClass * klass) {
+static void
+publishing_you_tube_publishing_options_pane_class_init (PublishingYouTubePublishingOptionsPaneClass * klass)
+{
 #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 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2936,11 +3213,13 @@ static void publishing_you_tube_publishing_options_pane_class_init (PublishingYo
 	publishing_you_tube_publishing_options_pane_signals[PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL] = 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 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_publishing_options_pane_signals[PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL] = 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 2933 "YouTubePublishing.c"
+#line 3210 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
+static void
+publishing_you_tube_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface)
+{
 #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 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2951,11 +3230,13 @@ static void publishing_you_tube_publishing_options_pane_spit_publishing_dialog_p
 	iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_you_tube_publishing_options_pane_real_on_pane_installed;
 #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 2948 "YouTubePublishing.c"
+#line 3227 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_publishing_options_pane_instance_init (PublishingYouTubePublishingOptionsPane * self) {
+static void
+publishing_you_tube_publishing_options_pane_instance_init (PublishingYouTubePublishingOptionsPane * self)
+{
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv = PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
 #line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2972,11 +3253,13 @@ static void publishing_you_tube_publishing_options_pane_instance_init (Publishin
 	self->priv->builder = NULL;
 #line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->privacy_label = NULL;
-#line 2969 "YouTubePublishing.c"
+#line 3250 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_publishing_options_pane_finalize (GObject * obj) {
+static void
+publishing_you_tube_publishing_options_pane_finalize (GObject * obj)
+{
 	PublishingYouTubePublishingOptionsPane * self;
 #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);
@@ -3000,11 +3283,13 @@ static void publishing_you_tube_publishing_options_pane_finalize (GObject * obj)
 	_publishing_you_tube_publishing_parameters_unref0 (self->priv->publishing_parameters);
 #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 2997 "YouTubePublishing.c"
+#line 3280 "YouTubePublishing.c"
 }
 
 
-GType publishing_you_tube_publishing_options_pane_get_type (void) {
+GType
+publishing_you_tube_publishing_options_pane_get_type (void)
+{
 	static volatile gsize publishing_you_tube_publishing_options_pane_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_you_tube_publishing_options_pane_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingYouTubePublishingOptionsPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_you_tube_publishing_options_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingYouTubePublishingOptionsPane), 0, (GInstanceInitFunc) publishing_you_tube_publishing_options_pane_instance_init, NULL };
@@ -3018,19 +3303,18 @@ GType publishing_you_tube_publishing_options_pane_get_type (void) {
 }
 
 
-PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_construct (GType object_type, 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)
+{
 	PublishingYouTubeUploadTransaction* self = NULL;
 	PublishingRESTSupportGoogleSession* _tmp0_;
-	PublishingRESTSupportGoogleSession* _tmp1_;
-	gboolean _tmp2_;
-	PublishingRESTSupportGoogleSession* _tmp3_;
-	PublishingRESTSupportGoogleSession* _tmp4_;
-	PublishingYouTubePublishingParameters* _tmp5_;
-	PublishingYouTubePublishingParameters* _tmp6_;
-	SpitPublishingPublishable* _tmp7_;
-	SpitPublishingPublishable* _tmp8_;
-	GDataYouTubeService* _tmp9_;
-	GDataYouTubeService* _tmp10_;
+	PublishingYouTubePublishingParameters* _tmp1_;
+	SpitPublishingPublishable* _tmp2_;
+	GDataYouTubeService* _tmp3_;
 #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"
@@ -3040,75 +3324,70 @@ PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_const
 #line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
 #line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp0_ = session;
-#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);
+	self = (PublishingYouTubeUploadTransaction*) publishing_rest_support_google_publisher_authenticated_transaction_construct (object_type, session, PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
 #line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp1_ = session;
-#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 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_vala_assert (_tmp2_, "session.is_authenticated()");
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp3_ = session;
+	_vala_assert (publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)), "session.is_authenticated()");
 #line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp4_ = _publishing_rest_support_session_ref0 (_tmp3_);
+	_tmp0_ = _publishing_rest_support_session_ref0 (session);
 #line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
 #line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	self->priv->session = _tmp4_;
+	self->priv->session = _tmp0_;
 #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp5_ = parameters;
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp6_ = _publishing_you_tube_publishing_parameters_ref0 (_tmp5_);
+	_tmp1_ = _publishing_you_tube_publishing_parameters_ref0 (parameters);
 #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_you_tube_publishing_parameters_unref0 (self->priv->parameters);
 #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	self->priv->parameters = _tmp6_;
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp7_ = publishable;
+	self->priv->parameters = _tmp1_;
 #line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp8_ = _g_object_ref0 (_tmp7_);
+	_tmp2_ = _g_object_ref0 (publishable);
 #line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (self->priv->publishable);
 #line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	self->priv->publishable = _tmp8_;
-#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp9_ = youtube_service;
+	self->priv->publishable = _tmp2_;
 #line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp10_ = _g_object_ref0 (_tmp9_);
+	_tmp3_ = _g_object_ref0 (youtube_service);
 #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_;
+	self->priv->youtube_service = _tmp3_;
 #line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self;
-#line 3080 "YouTubePublishing.c"
+#line 3350 "YouTubePublishing.c"
 }
 
 
-PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_new (GDataYouTubeService* youtube_service, PublishingRESTSupportGoogleSession* session, PublishingYouTubePublishingParameters* parameters, SpitPublishingPublishable* publishable) {
+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 3087 "YouTubePublishing.c"
+#line 3362 "YouTubePublishing.c"
 }
 
 
-static Block1Data* block1_data_ref (Block1Data* _data1_) {
+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 3096 "YouTubePublishing.c"
+#line 3373 "YouTubePublishing.c"
 }
 
 
-static void block1_data_unref (void * _userdata_) {
+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 3105 "YouTubePublishing.c"
+#line 3384 "YouTubePublishing.c"
 		PublishingYouTubeUploadTransaction* self;
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		self = _data1_->self;
@@ -3118,14 +3397,18 @@ static void block1_data_unref (void * _userdata_) {
 		_publishing_rest_support_transaction_unref0 (self);
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		g_slice_free (Block1Data, _data1_);
-#line 3115 "YouTubePublishing.c"
+#line 3394 "YouTubePublishing.c"
 	}
 }
 
 
-static void ___lambda4_ (Block1Data* _data1_, GObject* obj, GAsyncResult* res) {
+static void
+___lambda4_ (Block1Data* _data1_,
+             GObject* obj,
+             GAsyncResult* res)
+{
 	PublishingYouTubeUploadTransaction* self;
-	GMainLoop* _tmp3_;
+	GMainLoop* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = _data1_->self;
@@ -3133,40 +3416,37 @@ static void ___lambda4_ (Block1Data* _data1_, GObject* obj, GAsyncResult* res) {
 	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 3130 "YouTubePublishing.c"
+#line 3413 "YouTubePublishing.c"
 	{
-		GAsyncResult* _tmp0_;
-#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_);
+		publishing_you_tube_upload_transaction_splice_with_progress_finish (self, res, &_inner_error_);
 #line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3139 "YouTubePublishing.c"
-			goto __catch22_g_error;
+#line 3419 "YouTubePublishing.c"
+			goto __catch27_g_error;
 		}
 	}
-	goto __finally22;
-	__catch22_g_error:
+	goto __finally27;
+	__catch27_g_error:
 	{
 		GError* _error_ = NULL;
-		GError* _tmp1_;
-		const gchar* _tmp2_;
+		GError* _tmp0_;
+		const gchar* _tmp1_;
 #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_;
+		_tmp0_ = _error_;
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp2_ = _tmp1_->message;
+		_tmp1_ = _tmp0_->message;
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		g_critical ("YouTubePublishing.vala:451: Failed to upload: %s", _tmp2_);
+		g_critical ("YouTubePublishing.vala:451: Failed to upload: %s", _tmp1_);
 #line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_g_error_free0 (_error_);
-#line 3161 "YouTubePublishing.c"
+#line 3441 "YouTubePublishing.c"
 	}
-	__finally22:
+	__finally27:
 #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"
@@ -3175,26 +3455,33 @@ static void ___lambda4_ (Block1Data* _data1_, GObject* obj, GAsyncResult* res) {
 		g_clear_error (&_inner_error_);
 #line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 3172 "YouTubePublishing.c"
+#line 3452 "YouTubePublishing.c"
 	}
 #line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp3_ = _data1_->loop;
+	_tmp2_ = _data1_->loop;
 #line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_main_loop_quit (_tmp3_);
-#line 3178 "YouTubePublishing.c"
+	g_main_loop_quit (_tmp2_);
+#line 3458 "YouTubePublishing.c"
 }
 
 
-static void ____lambda4__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) {
+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 3187 "YouTubePublishing.c"
+#line 3471 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) {
+static void
+publishing_you_tube_upload_transaction_real_execute (PublishingRESTSupportTransaction* base,
+                                                     GError** error)
+{
 	PublishingYouTubeUploadTransaction * self;
 	GDataYouTubeVideo* video = NULL;
 	GDataYouTubeVideo* _tmp0_;
@@ -3209,12 +3496,10 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 	const gchar* _tmp9_;
 	GDataYouTubeVideo* _tmp10_;
 	PublishingYouTubePublishingParameters* _tmp11_;
-	PublishingYouTubePrivacySetting _tmp12_;
-	PublishingYouTubePublishingParameters* _tmp13_;
-	PublishingYouTubePrivacySetting _tmp14_;
+	PublishingYouTubePublishingParameters* _tmp12_;
 	GFile* file = NULL;
-	SpitPublishingPublishable* _tmp20_;
-	GFile* _tmp21_;
+	SpitPublishingPublishable* _tmp18_;
+	GFile* _tmp19_;
 	GError * _inner_error_ = NULL;
 #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);
@@ -3238,7 +3523,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 	_tmp5_ = title;
 #line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (g_strcmp0 (_tmp5_, "") == 0) {
-#line 3235 "YouTubePublishing.c"
+#line 3520 "YouTubePublishing.c"
 		SpitPublishingPublishable* _tmp6_;
 		gchar* _tmp7_;
 #line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3249,7 +3534,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 		_g_free0 (title);
 #line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		title = _tmp7_;
-#line 3246 "YouTubePublishing.c"
+#line 3531 "YouTubePublishing.c"
 	}
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp8_ = video;
@@ -3262,75 +3547,71 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 #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;
+	g_object_set (_tmp10_, "is-private", publishing_you_tube_publishing_parameters_get_privacy (_tmp11_) == PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PRIVATE, NULL);
 #line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp14_ = publishing_you_tube_publishing_parameters_get_privacy (_tmp13_);
+	_tmp12_ = self->priv->parameters;
 #line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	if (_tmp14_ == PUBLISHING_YOU_TUBE_PRIVACY_SETTING_UNLISTED) {
-#line 3268 "YouTubePublishing.c"
-		GDataYouTubeVideo* _tmp15_;
+	if (publishing_you_tube_publishing_parameters_get_privacy (_tmp12_) == PUBLISHING_YOU_TUBE_PRIVACY_SETTING_UNLISTED) {
+#line 3549 "YouTubePublishing.c"
+		GDataYouTubeVideo* _tmp13_;
 #line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp15_ = video;
+		_tmp13_ = 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 3274 "YouTubePublishing.c"
+		gdata_youtube_video_set_access_control (_tmp13_, "list", GDATA_YOUTUBE_PERMISSION_DENIED);
+#line 3555 "YouTubePublishing.c"
 	} else {
-		GDataYouTubeVideo* _tmp16_;
-		gboolean _tmp17_;
-		gboolean _tmp18_;
+		GDataYouTubeVideo* _tmp14_;
+		gboolean _tmp15_;
+		gboolean _tmp16_;
 #line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp16_ = video;
+		_tmp14_ = video;
 #line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		g_object_get (_tmp16_, "is-private", &_tmp17_, NULL);
+		g_object_get (_tmp14_, "is-private", &_tmp15_, NULL);
 #line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp18_ = _tmp17_;
+		_tmp16_ = _tmp15_;
 #line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		if (!_tmp18_) {
-#line 3287 "YouTubePublishing.c"
-			GDataYouTubeVideo* _tmp19_;
+		if (!_tmp16_) {
+#line 3568 "YouTubePublishing.c"
+			GDataYouTubeVideo* _tmp17_;
 #line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_tmp19_ = video;
+			_tmp17_ = 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 3293 "YouTubePublishing.c"
+			gdata_youtube_video_set_access_control (_tmp17_, "list", GDATA_YOUTUBE_PERMISSION_ALLOWED);
+#line 3574 "YouTubePublishing.c"
 		}
 	}
 #line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp20_ = self->priv->publishable;
+	_tmp18_ = self->priv->publishable;
 #line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp21_ = spit_publishing_publishable_get_serialized_file (_tmp20_);
+	_tmp19_ = spit_publishing_publishable_get_serialized_file (_tmp18_);
 #line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	file = _tmp21_;
-#line 3302 "YouTubePublishing.c"
+	file = _tmp19_;
+#line 3583 "YouTubePublishing.c"
 	{
 		Block1Data* _data1_;
 		GFileInfo* info = NULL;
-		GFile* _tmp22_;
-		GFileInfo* _tmp23_;
+		GFile* _tmp20_;
+		GFileInfo* _tmp21_;
 		GDataUploadStream* upload_stream = NULL;
-		GDataYouTubeService* _tmp24_;
-		GDataYouTubeVideo* _tmp25_;
+		GDataYouTubeService* _tmp22_;
+		GDataYouTubeVideo* _tmp23_;
+		const gchar* _tmp24_;
+		GFileInfo* _tmp25_;
 		const gchar* _tmp26_;
-		GFileInfo* _tmp27_;
-		const gchar* _tmp28_;
-		GDataUploadStream* _tmp29_;
+		GDataUploadStream* _tmp27_;
 		GFileInputStream* input_stream = NULL;
-		GFile* _tmp30_;
-		GFileInputStream* _tmp31_;
-		GMainLoop* _tmp32_;
-		GFileInfo* _tmp33_;
-		GFileInputStream* _tmp34_;
-		GDataUploadStream* _tmp35_;
-		GMainLoop* _tmp36_;
-		GDataYouTubeVideo* _tmp37_ = NULL;
-		GDataYouTubeService* _tmp38_;
-		GDataUploadStream* _tmp39_;
-		GDataYouTubeVideo* _tmp40_;
-		GDataYouTubeVideo* _tmp41_;
+		GFile* _tmp28_;
+		GFileInputStream* _tmp29_;
+		GMainLoop* _tmp30_;
+		GFileInfo* _tmp31_;
+		GFileInputStream* _tmp32_;
+		GDataUploadStream* _tmp33_;
+		GMainLoop* _tmp34_;
+		GDataYouTubeVideo* _tmp35_ = NULL;
+		GDataYouTubeService* _tmp36_;
+		GDataUploadStream* _tmp37_;
+		GDataYouTubeVideo* _tmp38_;
+		GDataYouTubeVideo* _tmp39_;
 #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"
@@ -3338,34 +3619,34 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 #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;
+		_tmp20_ = 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_);
+		_tmp21_ = g_file_query_info (_tmp20_, 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_;
+		info = _tmp21_;
 #line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #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 3346 "YouTubePublishing.c"
-			goto __catch21_g_error;
+#line 3627 "YouTubePublishing.c"
+			goto __catch26_g_error;
 		}
 #line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp24_ = self->priv->youtube_service;
+		_tmp22_ = self->priv->youtube_service;
 #line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp25_ = video;
+		_tmp23_ = video;
 #line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp26_ = slug;
+		_tmp24_ = slug;
 #line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp27_ = info;
+		_tmp25_ = info;
 #line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp28_ = g_file_info_get_content_type (_tmp27_);
+		_tmp26_ = g_file_info_get_content_type (_tmp25_);
 #line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp29_ = gdata_youtube_service_upload_video (_tmp24_, _tmp25_, _tmp26_, _tmp28_, NULL, &_inner_error_);
+		_tmp27_ = gdata_youtube_service_upload_video (_tmp22_, _tmp23_, _tmp24_, _tmp26_, NULL, &_inner_error_);
 #line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		upload_stream = _tmp29_;
+		upload_stream = _tmp27_;
 #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"
@@ -3374,15 +3655,15 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 			block1_data_unref (_data1_);
 #line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_data1_ = NULL;
-#line 3371 "YouTubePublishing.c"
-			goto __catch21_g_error;
+#line 3652 "YouTubePublishing.c"
+			goto __catch26_g_error;
 		}
 #line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp30_ = file;
+		_tmp28_ = file;
 #line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp31_ = g_file_read (_tmp30_, NULL, &_inner_error_);
+		_tmp29_ = g_file_read (_tmp28_, NULL, &_inner_error_);
 #line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		input_stream = _tmp31_;
+		input_stream = _tmp29_;
 #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"
@@ -3393,33 +3674,33 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 			block1_data_unref (_data1_);
 #line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_data1_ = NULL;
-#line 3390 "YouTubePublishing.c"
-			goto __catch21_g_error;
+#line 3671 "YouTubePublishing.c"
+			goto __catch26_g_error;
 		}
 #line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp32_ = g_main_loop_new (NULL, FALSE);
+		_tmp30_ = g_main_loop_new (NULL, FALSE);
 #line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_data1_->loop = _tmp32_;
+		_data1_->loop = _tmp30_;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp33_ = info;
+		_tmp31_ = info;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp34_ = input_stream;
+		_tmp32_ = input_stream;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp35_ = upload_stream;
+		_tmp33_ = 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_));
+		publishing_you_tube_upload_transaction_splice_with_progress (self, _tmp31_, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, g_input_stream_get_type (), GInputStream), G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, 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;
+		_tmp34_ = _data1_->loop;
 #line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		g_main_loop_run (_tmp36_);
+		g_main_loop_run (_tmp34_);
 #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp38_ = self->priv->youtube_service;
+		_tmp36_ = self->priv->youtube_service;
 #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp39_ = upload_stream;
+		_tmp37_ = upload_stream;
 #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp40_ = gdata_youtube_service_finish_video_upload (_tmp38_, _tmp39_, &_inner_error_);
+		_tmp38_ = gdata_youtube_service_finish_video_upload (_tmp36_, _tmp37_, &_inner_error_);
 #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp37_ = _tmp40_;
+		_tmp35_ = _tmp38_;
 #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"
@@ -3432,19 +3713,19 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 			block1_data_unref (_data1_);
 #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_data1_ = NULL;
-#line 3429 "YouTubePublishing.c"
-			goto __catch21_g_error;
+#line 3710 "YouTubePublishing.c"
+			goto __catch26_g_error;
 		}
 #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp41_ = _tmp37_;
+		_tmp39_ = _tmp35_;
 #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp37_ = NULL;
+		_tmp35_ = 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_;
+		video = _tmp39_;
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_g_object_unref0 (_tmp37_);
+		_g_object_unref0 (_tmp35_);
 #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"
@@ -3455,29 +3736,29 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 		block1_data_unref (_data1_);
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_data1_ = NULL;
-#line 3452 "YouTubePublishing.c"
+#line 3733 "YouTubePublishing.c"
 	}
-	goto __finally21;
-	__catch21_g_error:
+	goto __finally26;
+	__catch26_g_error:
 	{
 		GError* _error_ = NULL;
-		GError* _tmp42_;
-		const gchar* _tmp43_;
+		GError* _tmp40_;
+		const gchar* _tmp41_;
 #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 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp42_ = _error_;
+		_tmp40_ = _error_;
 #line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp43_ = _tmp42_->message;
+		_tmp41_ = _tmp40_->message;
 #line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		g_critical ("YouTubePublishing.vala:458: Upload failed: %s", _tmp43_);
+		g_critical ("YouTubePublishing.vala:458: Upload failed: %s", _tmp41_);
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_g_error_free0 (_error_);
-#line 3472 "YouTubePublishing.c"
+#line 3753 "YouTubePublishing.c"
 	}
-	__finally21:
+	__finally26:
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3494,7 +3775,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 			_g_object_unref0 (video);
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			return;
-#line 3491 "YouTubePublishing.c"
+#line 3772 "YouTubePublishing.c"
 		} else {
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_g_object_unref0 (file);
@@ -3510,7 +3791,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 			g_clear_error (&_inner_error_);
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			return;
-#line 3507 "YouTubePublishing.c"
+#line 3788 "YouTubePublishing.c"
 		}
 	}
 #line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3521,11 +3802,13 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 	_g_free0 (slug);
 #line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (video);
-#line 3518 "YouTubePublishing.c"
+#line 3799 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_upload_transaction_splice_with_progress_data_free (gpointer _data) {
+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"
@@ -3538,11 +3821,15 @@ static void publishing_you_tube_upload_transaction_splice_with_progress_data_fre
 	_publishing_rest_support_transaction_unref0 (_data_->self);
 #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_slice_free (PublishingYouTubeUploadTransactionSpliceWithProgressData, _data_);
-#line 3535 "YouTubePublishing.c"
+#line 3818 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_upload_transaction_splice_with_progress_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data) {
+static void
+publishing_you_tube_upload_transaction_splice_with_progress_async_ready_wrapper (GObject *source_object,
+                                                                                 GAsyncResult *res,
+                                                                                 void *user_data)
+{
 	PublishingYouTubeUploadTransactionSpliceWithProgressData* _task_data_;
 #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_task_data_ = g_task_get_task_data (G_TASK (res));
@@ -3550,30 +3837,36 @@ static void publishing_you_tube_upload_transaction_splice_with_progress_async_re
 	if (_task_data_->_callback_ != NULL) {
 #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_task_data_->_callback_ (source_object, res, user_data);
-#line 3547 "YouTubePublishing.c"
+#line 3834 "YouTubePublishing.c"
 	}
 #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_task_data_->_task_complete_ = TRUE;
-#line 3551 "YouTubePublishing.c"
+#line 3838 "YouTubePublishing.c"
 }
 
 
-static gpointer _publishing_rest_support_transaction_ref0 (gpointer self) {
+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 3558 "YouTubePublishing.c"
+#line 3847 "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_) {
+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_;
 	GFileInfo* _tmp1_;
-	GFileInfo* _tmp2_;
-	GInputStream* _tmp3_;
-	GInputStream* _tmp4_;
-	GOutputStream* _tmp5_;
-	GOutputStream* _tmp6_;
+	GInputStream* _tmp2_;
+	GOutputStream* _tmp3_;
 #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"
@@ -3584,7 +3877,7 @@ static void publishing_you_tube_upload_transaction_splice_with_progress (Publish
 	if (_callback_ == NULL) {
 #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_data_->_task_complete_ = TRUE;
-#line 3581 "YouTubePublishing.c"
+#line 3874 "YouTubePublishing.c"
 	}
 #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_task_set_task_data (_data_->_async_result, _data_, publishing_you_tube_upload_transaction_splice_with_progress_data_free);
@@ -3593,36 +3886,34 @@ static void publishing_you_tube_upload_transaction_splice_with_progress (Publish
 #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_);
+	_tmp1_ = _g_object_ref0 (info);
 #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;
+	_data_->info = _tmp1_;
 #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp4_ = _g_object_ref0 (_tmp3_);
+	_tmp2_ = _g_object_ref0 (input);
 #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_;
+	_data_->input = _tmp2_;
 #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_);
+	_tmp3_ = _g_object_ref0 (output);
 #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_;
+	_data_->output = _tmp3_;
 #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_upload_transaction_splice_with_progress_co (_data_);
-#line 3615 "YouTubePublishing.c"
+#line 3902 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_upload_transaction_splice_with_progress_finish (PublishingYouTubeUploadTransaction* self, GAsyncResult* _res_, GError** error) {
+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"
 	_data_ = g_task_propagate_pointer (G_TASK (_res_), error);
@@ -3630,12 +3921,16 @@ static void publishing_you_tube_upload_transaction_splice_with_progress_finish (
 	if (NULL == _data_) {
 #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 3627 "YouTubePublishing.c"
+#line 3918 "YouTubePublishing.c"
 	}
 }
 
 
-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_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_;
@@ -3647,73 +3942,67 @@ static void publishing_you_tube_upload_transaction_splice_with_progress_ready (G
 	_data_->_task_complete_ = TRUE;
 #line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_upload_transaction_splice_with_progress_co (_data_);
-#line 3644 "YouTubePublishing.c"
+#line 3939 "YouTubePublishing.c"
 }
 
 
-static gboolean publishing_you_tube_upload_transaction_splice_with_progress_co (PublishingYouTubeUploadTransactionSpliceWithProgressData* _data_) {
+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 3653 "YouTubePublishing.c"
+#line 3950 "YouTubePublishing.c"
 		goto _state_0;
 #line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		case 1:
-#line 3657 "YouTubePublishing.c"
+#line 3954 "YouTubePublishing.c"
 		goto _state_1;
 #line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		case 2:
-#line 3661 "YouTubePublishing.c"
+#line 3958 "YouTubePublishing.c"
 		goto _state_2;
 #line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		case 3:
-#line 3665 "YouTubePublishing.c"
+#line 3962 "YouTubePublishing.c"
 		goto _state_3;
 #line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		case 4:
-#line 3669 "YouTubePublishing.c"
+#line 3966 "YouTubePublishing.c"
 		goto _state_4;
 		default:
 #line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		g_assert_not_reached ();
-#line 3674 "YouTubePublishing.c"
+#line 3971 "YouTubePublishing.c"
 	}
 	_state_0:
 #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_ = g_file_info_get_size (_data_->_tmp0_);
-#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_data_->total_bytes = _data_->_tmp1_;
+	_data_->total_bytes = g_file_info_get_size (_data_->info);
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_data_->_tmp2_ = _data_->total_bytes;
+	_data_->_tmp0_ = _data_->total_bytes;
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_data_->bytes_to_write = _data_->_tmp2_;
+	_data_->bytes_to_write = _data_->_tmp0_;
 #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_ = _data_->bytes_to_write;
+		_data_->_tmp1_ = _data_->bytes_to_write;
 #line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		if (!(_data_->_tmp3_ > ((gint64) 0))) {
+		if (!(_data_->_tmp1_ > ((gint64) 0))) {
 #line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			break;
-#line 3695 "YouTubePublishing.c"
+#line 3988 "YouTubePublishing.c"
 		}
 #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_);
+		g_input_stream_read_async (_data_->input, _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 3705 "YouTubePublishing.c"
+#line 3996 "YouTubePublishing.c"
 		_state_1:
 #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_;
+		_data_->bytes_read = g_input_stream_read_finish (_data_->input, _data_->_res_, &_data_->_inner_error_);
 #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"
@@ -3722,32 +4011,28 @@ static gboolean publishing_you_tube_upload_transaction_splice_with_progress_co (
 			g_object_unref (_data_->_async_result);
 #line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			return FALSE;
-#line 3719 "YouTubePublishing.c"
+#line 4008 "YouTubePublishing.c"
 		}
 #line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_data_->_tmp6_ = _data_->bytes_read;
+		_data_->_tmp2_ = _data_->bytes_read;
 #line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		if (_data_->_tmp6_ == ((gssize) 0)) {
+		if (_data_->_tmp2_ == ((gssize) 0)) {
 #line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			break;
-#line 3727 "YouTubePublishing.c"
+#line 4016 "YouTubePublishing.c"
 		}
 #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_ = _data_->bytes_read;
+		_data_->_tmp3_ = _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_);
+		g_output_stream_write_async (_data_->output, _data_->buffer + 0, (gsize) (((gint) _data_->_tmp3_) - 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 3739 "YouTubePublishing.c"
+#line 4026 "YouTubePublishing.c"
 		_state_2:
 #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_;
+		_data_->bytes_written = g_output_stream_write_finish (_data_->output, _data_->_res_, &_data_->_inner_error_);
 #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"
@@ -3756,36 +4041,34 @@ static gboolean publishing_you_tube_upload_transaction_splice_with_progress_co (
 			g_object_unref (_data_->_async_result);
 #line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			return FALSE;
-#line 3753 "YouTubePublishing.c"
+#line 4038 "YouTubePublishing.c"
 		}
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_data_->_tmp10_ = _data_->bytes_to_write;
+		_data_->_tmp4_ = _data_->bytes_to_write;
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_data_->_tmp11_ = _data_->bytes_written;
+		_data_->_tmp5_ = _data_->bytes_written;
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_data_->bytes_to_write = _data_->_tmp10_ - _data_->_tmp11_;
+		_data_->bytes_to_write = _data_->_tmp4_ - _data_->_tmp5_;
 #line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_data_->_tmp12_ = _data_->total_bytes;
+		_data_->_tmp6_ = _data_->total_bytes;
 #line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_data_->_tmp13_ = _data_->bytes_to_write;
+		_data_->_tmp7_ = _data_->bytes_to_write;
 #line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_data_->_tmp14_ = _data_->total_bytes;
+		_data_->_tmp8_ = _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 3769 "YouTubePublishing.c"
+		g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_data_->self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "chunk-transmitted", (gint) (_data_->_tmp6_ - _data_->_tmp7_), (gint) _data_->_tmp8_);
+#line 4054 "YouTubePublishing.c"
 	}
 #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_);
+	g_output_stream_close_async (_data_->output, 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 3779 "YouTubePublishing.c"
+#line 4062 "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_);
+	g_output_stream_close_finish (_data_->output, _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"
@@ -3794,20 +4077,18 @@ static gboolean publishing_you_tube_upload_transaction_splice_with_progress_co (
 		g_object_unref (_data_->_async_result);
 #line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return FALSE;
-#line 3791 "YouTubePublishing.c"
+#line 4074 "YouTubePublishing.c"
 	}
 #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_);
+	g_input_stream_close_async (_data_->input, 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 3801 "YouTubePublishing.c"
+#line 4082 "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_);
+	g_input_stream_close_finish (_data_->input, _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"
@@ -3816,7 +4097,7 @@ static gboolean publishing_you_tube_upload_transaction_splice_with_progress_co (
 		g_object_unref (_data_->_async_result);
 #line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return FALSE;
-#line 3813 "YouTubePublishing.c"
+#line 4094 "YouTubePublishing.c"
 	}
 #line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_task_return_pointer (_data_->_async_result, _data_, NULL);
@@ -3826,18 +4107,20 @@ static gboolean publishing_you_tube_upload_transaction_splice_with_progress_co (
 		while (_data_->_task_complete_ != TRUE) {
 #line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE);
-#line 3823 "YouTubePublishing.c"
+#line 4104 "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 3830 "YouTubePublishing.c"
+#line 4111 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_upload_transaction_class_init (PublishingYouTubeUploadTransactionClass * klass) {
+static void
+publishing_you_tube_upload_transaction_class_init (PublishingYouTubeUploadTransactionClass * klass)
+{
 #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 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3846,18 +4129,22 @@ static void publishing_you_tube_upload_transaction_class_init (PublishingYouTube
 	g_type_class_add_private (klass, sizeof (PublishingYouTubeUploadTransactionPrivate));
 #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_you_tube_upload_transaction_real_execute;
-#line 3843 "YouTubePublishing.c"
+#line 4126 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_upload_transaction_instance_init (PublishingYouTubeUploadTransaction * self) {
+static void
+publishing_you_tube_upload_transaction_instance_init (PublishingYouTubeUploadTransaction * self)
+{
 #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv = PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_GET_PRIVATE (self);
-#line 3850 "YouTubePublishing.c"
+#line 4135 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_upload_transaction_finalize (PublishingRESTSupportTransaction * obj) {
+static void
+publishing_you_tube_upload_transaction_finalize (PublishingRESTSupportTransaction * obj)
+{
 	PublishingYouTubeUploadTransaction * self;
 #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);
@@ -3871,11 +4158,13 @@ static void publishing_you_tube_upload_transaction_finalize (PublishingRESTSuppo
 	_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 3868 "YouTubePublishing.c"
+#line 4155 "YouTubePublishing.c"
 }
 
 
-GType publishing_you_tube_upload_transaction_get_type (void) {
+GType
+publishing_you_tube_upload_transaction_get_type (void)
+{
 	static volatile gsize publishing_you_tube_upload_transaction_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_you_tube_upload_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingYouTubeUploadTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_you_tube_upload_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingYouTubeUploadTransaction), 0, (GInstanceInitFunc) publishing_you_tube_upload_transaction_instance_init, NULL };
@@ -3887,15 +4176,17 @@ GType publishing_you_tube_upload_transaction_get_type (void) {
 }
 
 
-PublishingYouTubeUploader* publishing_you_tube_uploader_construct (GType object_type, 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)
+{
 	PublishingYouTubeUploader* self = NULL;
-	PublishingRESTSupportGoogleSession* _tmp0_;
-	SpitPublishingPublishable** _tmp1_;
-	gint _tmp1__length1;
-	PublishingYouTubePublishingParameters* _tmp2_;
-	PublishingYouTubePublishingParameters* _tmp3_;
-	GDataYouTubeService* _tmp4_;
-	GDataYouTubeService* _tmp5_;
+	PublishingYouTubePublishingParameters* _tmp0_;
+	GDataYouTubeService* _tmp1_;
 #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"
@@ -3903,43 +4194,42 @@ PublishingYouTubeUploader* publishing_you_tube_uploader_construct (GType object_
 #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 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp0_ = session;
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp1_ = publishables;
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp1__length1 = publishables_length1;
-#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 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp2_ = parameters;
+	self = (PublishingYouTubeUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), publishables, publishables_length1);
 #line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp3_ = _publishing_you_tube_publishing_parameters_ref0 (_tmp2_);
+	_tmp0_ = _publishing_you_tube_publishing_parameters_ref0 (parameters);
 #line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_you_tube_publishing_parameters_unref0 (self->priv->parameters);
 #line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	self->priv->parameters = _tmp3_;
+	self->priv->parameters = _tmp0_;
 #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_);
+	_tmp1_ = _g_object_ref0 (youtube_service);
 #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_;
+	self->priv->youtube_service = _tmp1_;
 #line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self;
-#line 3925 "YouTubePublishing.c"
+#line 4206 "YouTubePublishing.c"
 }
 
 
-PublishingYouTubeUploader* publishing_you_tube_uploader_new (GDataYouTubeService* youtube_service, 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)
+{
 #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 3932 "YouTubePublishing.c"
+#line 4219 "YouTubePublishing.c"
 }
 
 
-static PublishingRESTSupportTransaction* publishing_you_tube_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable) {
+static PublishingRESTSupportTransaction*
+publishing_you_tube_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base,
+                                                      SpitPublishingPublishable* publishable)
+{
 	PublishingYouTubeUploader * self;
 	PublishingRESTSupportTransaction* result = NULL;
 	GDataYouTubeService* _tmp0_;
@@ -3978,11 +4268,13 @@ static PublishingRESTSupportTransaction* publishing_you_tube_uploader_real_creat
 	result = _tmp7_;
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 3975 "YouTubePublishing.c"
+#line 4265 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_uploader_class_init (PublishingYouTubeUploaderClass * klass) {
+static void
+publishing_you_tube_uploader_class_init (PublishingYouTubeUploaderClass * klass)
+{
 #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_uploader_parent_class = g_type_class_peek_parent (klass);
 #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3991,18 +4283,22 @@ static void publishing_you_tube_uploader_class_init (PublishingYouTubeUploaderCl
 	g_type_class_add_private (klass, sizeof (PublishingYouTubeUploaderPrivate));
 #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_you_tube_uploader_real_create_transaction;
-#line 3988 "YouTubePublishing.c"
+#line 4280 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_uploader_instance_init (PublishingYouTubeUploader * self) {
+static void
+publishing_you_tube_uploader_instance_init (PublishingYouTubeUploader * self)
+{
 #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv = PUBLISHING_YOU_TUBE_UPLOADER_GET_PRIVATE (self);
-#line 3995 "YouTubePublishing.c"
+#line 4289 "YouTubePublishing.c"
 }
 
 
-static void publishing_you_tube_uploader_finalize (PublishingRESTSupportBatchUploader * obj) {
+static void
+publishing_you_tube_uploader_finalize (PublishingRESTSupportBatchUploader * obj)
+{
 	PublishingYouTubeUploader * self;
 #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YOU_TUBE_TYPE_UPLOADER, PublishingYouTubeUploader);
@@ -4012,11 +4308,13 @@ static void publishing_you_tube_uploader_finalize (PublishingRESTSupportBatchUpl
 	_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 4009 "YouTubePublishing.c"
+#line 4305 "YouTubePublishing.c"
 }
 
 
-GType publishing_you_tube_uploader_get_type (void) {
+GType
+publishing_you_tube_uploader_get_type (void)
+{
 	static volatile gsize publishing_you_tube_uploader_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_you_tube_uploader_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingYouTubeUploaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_you_tube_uploader_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingYouTubeUploader), 0, (GInstanceInitFunc) publishing_you_tube_uploader_instance_init, NULL };
@@ -4028,7 +4326,11 @@ GType publishing_you_tube_uploader_get_type (void) {
 }
 
 
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_destroy (gpointer array,
+                     gint array_length,
+                     GDestroyNotify destroy_func)
+{
 	if ((array != NULL) && (destroy_func != NULL)) {
 		int i;
 		for (i = 0; i < array_length; i = i + 1) {
@@ -4040,7 +4342,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti
 }
 
 
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_free (gpointer array,
+                  gint array_length,
+                  GDestroyNotify destroy_func)
+{
 	_vala_array_destroy (array, array_length, destroy_func);
 	g_free (array);
 }
diff --git a/plugins/shotwell-publishing/meson.build b/plugins/shotwell-publishing/meson.build
new file mode 100644
index 0000000..45058b8
--- /dev/null
+++ b/plugins/shotwell-publishing/meson.build
@@ -0,0 +1,25 @@
+shotwell_publishing_sources = [
+    'shotwell-publishing.vala',
+    'FacebookPublishing.vala',
+    'PicasaPublishing.vala',
+    'FlickrPublishing.vala',
+    'TumblrPublishing.vala',
+    'YouTubePublishing.vala',
+    'PiwigoPublishing.vala']
+
+shotwell_publishing_resources = gnome.compile_resources('publishing-resource',
+        'org.gnome.Shotwell.Publishing.gresource.xml',
+        source_dir : meson.source_root())
+
+shared_module('shotwell-publishing',
+              shotwell_publishing_sources + shotwell_publishing_resources,
+              dependencies : [gtk, soup, gexiv2, gee, sw_plugin, json_glib,
+                              webkit, sw_plugin_common_dep, xml, gdata, gcr,
+                              gcr_ui, authenticator_dep],
+              vala_args : [
+                  '--gresources', 'org.gnome.Shotwell.Publishing.gresource.xml'
+                  ],
+              c_args : ['-DPLUGIN_RESOURCE_PATH="/org/gnome/Shotwell/Publishing"',
+                        '-DGCR_API_SUBJECT_TO_CHANGE'],
+              install: true,
+              install_dir : shotwell_plugin_dir)
diff --git a/plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml b/plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml
index b09902e..5e8ce1c 100644
--- a/plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml
+++ b/plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml
@@ -6,6 +6,7 @@
       <file>picasa.png</file>
       <file>piwigo.png</file>
       <file>youtube.png</file>
+      <file>tumblr.png</file>
       <file>facebook_publishing_options_pane.ui</file>
       <file>flickr_publishing_options_pane.ui</file>
       <file>picasa_publishing_options_pane.ui</file>
@@ -13,5 +14,6 @@
       <file>piwigo_publishing_options_pane.ui</file>
       <file>piwigo_ssl_failure_pane.ui</file>
       <file>youtube_publishing_options_pane.ui</file>
+      <file>tumblr_publishing_options_pane.ui</file>
   </gresource>
 </gresources>
diff --git a/plugins/shotwell-publishing/shotwell-publishing.c b/plugins/shotwell-publishing/shotwell-publishing.c
index 8d7d080..0a2cf42 100644
--- a/plugins/shotwell-publishing/shotwell-publishing.c
+++ b/plugins/shotwell-publishing/shotwell-publishing.c
@@ -1,4 +1,4 @@
-/* shotwell-publishing.c generated by valac 0.36.6, the Vala compiler
+/* shotwell-publishing.c generated by valac 0.40.4, the Vala compiler
  * generated from shotwell-publishing.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <shotwell-plugin-dev-1.0.h>
@@ -28,6 +29,11 @@
 typedef struct _ShotwellPublishingCoreServices ShotwellPublishingCoreServices;
 typedef struct _ShotwellPublishingCoreServicesClass ShotwellPublishingCoreServicesClass;
 typedef struct _ShotwellPublishingCoreServicesPrivate ShotwellPublishingCoreServicesPrivate;
+enum  {
+	SHOTWELL_PUBLISHING_CORE_SERVICES_0_PROPERTY,
+	SHOTWELL_PUBLISHING_CORE_SERVICES_NUM_PROPERTIES
+};
+static GParamSpec* shotwell_publishing_core_services_properties[SHOTWELL_PUBLISHING_CORE_SERVICES_NUM_PROPERTIES];
 #define _g_free0(var) (var = (g_free (var), NULL))
 
 #define TYPE_FACEBOOK_SERVICE (facebook_service_get_type ())
@@ -79,6 +85,16 @@ typedef struct _YouTubeServiceClass YouTubeServiceClass;
 
 typedef struct _PiwigoService PiwigoService;
 typedef struct _PiwigoServiceClass PiwigoServiceClass;
+
+#define TYPE_TUMBLR_SERVICE (tumblr_service_get_type ())
+#define TUMBLR_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_TUMBLR_SERVICE, TumblrService))
+#define TUMBLR_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_TUMBLR_SERVICE, TumblrServiceClass))
+#define IS_TUMBLR_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_TUMBLR_SERVICE))
+#define IS_TUMBLR_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_TUMBLR_SERVICE))
+#define TUMBLR_SERVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_TUMBLR_SERVICE, TumblrServiceClass))
+
+typedef struct _TumblrService TumblrService;
+typedef struct _TumblrServiceClass TumblrServiceClass;
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 
 struct _ShotwellPublishingCoreServices {
@@ -102,294 +118,379 @@ static SpitModuleIface * shotwell_publishing_core_services_spit_module_parent_if
 
 GType shotwell_publishing_core_services_get_type (void) G_GNUC_CONST;
 #define SHOTWELL_PUBLISHING_CORE_SERVICES_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SHOTWELL_PUBLISHING_CORE_SERVICES, ShotwellPublishingCoreServicesPrivate))
-enum  {
-	SHOTWELL_PUBLISHING_CORE_SERVICES_DUMMY_PROPERTY
-};
 ShotwellPublishingCoreServices* shotwell_publishing_core_services_new (GFile* module_file);
-ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GType object_type, GFile* module_file);
+ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GType object_type,
+                                                                             GFile* module_file);
 FacebookService* facebook_service_new (GFile* resource_directory);
-FacebookService* facebook_service_construct (GType object_type, GFile* resource_directory);
+FacebookService* facebook_service_construct (GType object_type,
+                                             GFile* resource_directory);
 GType facebook_service_get_type (void) G_GNUC_CONST;
-static void _vala_array_add1 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
+static void _vala_array_add1 (SpitPluggable** * array,
+                       int* length,
+                       int* size,
+                       SpitPluggable* value);
 PicasaService* picasa_service_new (GFile* resource_directory);
-PicasaService* picasa_service_construct (GType object_type, GFile* resource_directory);
+PicasaService* picasa_service_construct (GType object_type,
+                                         GFile* resource_directory);
 GType picasa_service_get_type (void) G_GNUC_CONST;
-static void _vala_array_add2 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
+static void _vala_array_add2 (SpitPluggable** * array,
+                       int* length,
+                       int* size,
+                       SpitPluggable* value);
 FlickrService* flickr_service_new (GFile* resource_directory);
-FlickrService* flickr_service_construct (GType object_type, GFile* resource_directory);
+FlickrService* flickr_service_construct (GType object_type,
+                                         GFile* resource_directory);
 GType flickr_service_get_type (void) G_GNUC_CONST;
-static void _vala_array_add3 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
+static void _vala_array_add3 (SpitPluggable** * array,
+                       int* length,
+                       int* size,
+                       SpitPluggable* value);
 YouTubeService* you_tube_service_new (GFile* resource_directory);
-YouTubeService* you_tube_service_construct (GType object_type, GFile* resource_directory);
+YouTubeService* you_tube_service_construct (GType object_type,
+                                            GFile* resource_directory);
 GType you_tube_service_get_type (void) G_GNUC_CONST;
-static void _vala_array_add4 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
+static void _vala_array_add4 (SpitPluggable** * array,
+                       int* length,
+                       int* size,
+                       SpitPluggable* value);
 PiwigoService* piwigo_service_new (GFile* resource_directory);
-PiwigoService* piwigo_service_construct (GType object_type, GFile* resource_directory);
+PiwigoService* piwigo_service_construct (GType object_type,
+                                         GFile* resource_directory);
 GType piwigo_service_get_type (void) G_GNUC_CONST;
-static void _vala_array_add5 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
+static void _vala_array_add5 (SpitPluggable** * array,
+                       int* length,
+                       int* size,
+                       SpitPluggable* value);
+TumblrService* tumblr_service_new (GFile* resource_directory);
+TumblrService* tumblr_service_construct (GType object_type,
+                                         GFile* resource_directory);
+GType tumblr_service_get_type (void) G_GNUC_CONST;
+static void _vala_array_add6 (SpitPluggable** * array,
+                       int* length,
+                       int* size,
+                       SpitPluggable* value);
 static const gchar* shotwell_publishing_core_services_real_get_module_name (SpitModule* base);
 static const gchar* shotwell_publishing_core_services_real_get_version (SpitModule* base);
 static const gchar* shotwell_publishing_core_services_real_get_id (SpitModule* base);
-static SpitPluggable** shotwell_publishing_core_services_real_get_pluggables (SpitModule* base, int* result_length1);
+static SpitPluggable** shotwell_publishing_core_services_real_get_pluggables (SpitModule* base,
+                                                                       int* result_length1);
 static void shotwell_publishing_core_services_finalize (GObject * obj);
 SpitModule* spit_entry_point (SpitEntryPointParams* params);
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
-
-
-static void _vala_array_add1 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
+static void _vala_array_destroy (gpointer array,
+                          gint array_length,
+                          GDestroyNotify destroy_func);
+static void _vala_array_free (gpointer array,
+                       gint array_length,
+                       GDestroyNotify destroy_func);
+
+
+static void
+_vala_array_add1 (SpitPluggable** * array,
+                  int* length,
+                  int* size,
+                  SpitPluggable* value)
+{
 #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if ((*length) == (*size)) {
 #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 148 "shotwell-publishing.c"
+#line 200 "shotwell-publishing.c"
 	}
 #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[(*length)++] = value;
 #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[*length] = NULL;
-#line 154 "shotwell-publishing.c"
+#line 206 "shotwell-publishing.c"
 }
 
 
-static void _vala_array_add2 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
+static void
+_vala_array_add2 (SpitPluggable** * array,
+                  int* length,
+                  int* size,
+                  SpitPluggable* value)
+{
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if ((*length) == (*size)) {
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 165 "shotwell-publishing.c"
+#line 222 "shotwell-publishing.c"
 	}
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[(*length)++] = value;
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[*length] = NULL;
-#line 171 "shotwell-publishing.c"
+#line 228 "shotwell-publishing.c"
 }
 
 
-static void _vala_array_add3 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
+static void
+_vala_array_add3 (SpitPluggable** * array,
+                  int* length,
+                  int* size,
+                  SpitPluggable* value)
+{
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if ((*length) == (*size)) {
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 182 "shotwell-publishing.c"
+#line 244 "shotwell-publishing.c"
 	}
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[(*length)++] = value;
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[*length] = NULL;
-#line 188 "shotwell-publishing.c"
+#line 250 "shotwell-publishing.c"
 }
 
 
-static void _vala_array_add4 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
+static void
+_vala_array_add4 (SpitPluggable** * array,
+                  int* length,
+                  int* size,
+                  SpitPluggable* value)
+{
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if ((*length) == (*size)) {
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 199 "shotwell-publishing.c"
+#line 266 "shotwell-publishing.c"
 	}
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[(*length)++] = value;
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[*length] = NULL;
-#line 205 "shotwell-publishing.c"
+#line 272 "shotwell-publishing.c"
 }
 
 
-static void _vala_array_add5 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
+static void
+_vala_array_add5 (SpitPluggable** * array,
+                  int* length,
+                  int* size,
+                  SpitPluggable* value)
+{
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if ((*length) == (*size)) {
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 216 "shotwell-publishing.c"
+#line 288 "shotwell-publishing.c"
 	}
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[(*length)++] = value;
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[*length] = NULL;
-#line 222 "shotwell-publishing.c"
+#line 294 "shotwell-publishing.c"
 }
 
 
-ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GType object_type, GFile* module_file) {
+static void
+_vala_array_add6 (SpitPluggable** * array,
+                  int* length,
+                  int* size,
+                  SpitPluggable* value)
+{
+#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	if ((*length) == (*size)) {
+#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		*size = (*size) ? (2 * (*size)) : 4;
+#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		*array = g_renew (SpitPluggable*, *array, (*size) + 1);
+#line 310 "shotwell-publishing.c"
+	}
+#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	(*array)[(*length)++] = value;
+#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	(*array)[*length] = NULL;
+#line 316 "shotwell-publishing.c"
+}
+
+
+ShotwellPublishingCoreServices*
+shotwell_publishing_core_services_construct (GType object_type,
+                                             GFile* module_file)
+{
 	ShotwellPublishingCoreServices * self = NULL;
 	GFile* resource_directory = NULL;
 	GFile* _tmp0_;
-	GFile* _tmp1_;
 	PublishingAuthenticatorFactory* factory = NULL;
-	PublishingAuthenticatorFactory* _tmp2_;
+	PublishingAuthenticatorFactory* _tmp1_;
 	GeeList* authenicators = NULL;
-	PublishingAuthenticatorFactory* _tmp3_;
-	GeeList* _tmp4_;
-	GFile* _tmp5_;
+	PublishingAuthenticatorFactory* _tmp2_;
+	GeeList* _tmp3_;
+	GFile* _tmp4_;
+	gchar* _tmp5_;
 	gchar* _tmp6_;
-	gchar* _tmp7_;
-	GeeList* _tmp8_;
+	GeeList* _tmp7_;
+	gint _tmp8_;
 	gint _tmp9_;
-	gint _tmp10_;
-	GeeList* _tmp11_;
-	gboolean _tmp12_;
-	GeeList* _tmp16_;
-	gboolean _tmp17_;
-	GeeList* _tmp21_;
-	gboolean _tmp22_;
-	GeeList* _tmp26_;
-	gboolean _tmp27_;
-	SpitPluggable** _tmp31_;
-	gint _tmp31__length1;
-	GFile* _tmp32_;
-	PiwigoService* _tmp33_;
+	GeeList* _tmp10_;
+	GeeList* _tmp14_;
+	GeeList* _tmp18_;
+	GeeList* _tmp22_;
+	SpitPluggable** _tmp26_;
+	gint _tmp26__length1;
+	GFile* _tmp27_;
+	PiwigoService* _tmp28_;
+	SpitPluggable** _tmp29_;
+	gint _tmp29__length1;
+	GFile* _tmp30_;
+	GFile* _tmp31_;
+	TumblrService* _tmp32_;
 #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"
 	self = (ShotwellPublishingCoreServices*) g_object_new (object_type, NULL);
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp0_ = module_file;
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp1_ = g_file_get_parent (_tmp0_);
+	_tmp0_ = g_file_get_parent (module_file);
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	resource_directory = _tmp1_;
+	resource_directory = _tmp0_;
 #line 17 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp2_ = publishing_authenticator_factory_get_instance ();
+	_tmp1_ = publishing_authenticator_factory_get_instance ();
 #line 17 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	factory = _tmp2_;
+	factory = _tmp1_;
 #line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp3_ = factory;
+	_tmp2_ = factory;
 #line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp4_ = spit_publishing_authenticator_factory_get_available_authenticators (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY, SpitPublishingAuthenticatorFactory));
+	_tmp3_ = spit_publishing_authenticator_factory_get_available_authenticators (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY, SpitPublishingAuthenticatorFactory));
 #line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	authenicators = _tmp4_;
+	authenicators = _tmp3_;
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp5_ = resource_directory;
+	_tmp4_ = resource_directory;
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp6_ = g_file_get_path (_tmp5_);
+	_tmp5_ = g_file_get_path (_tmp4_);
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp7_ = _tmp6_;
+	_tmp6_ = _tmp5_;
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	g_debug ("shotwell-publishing.vala:22: Looking for resources in %s", _tmp7_);
+	g_debug ("shotwell-publishing.vala:22: Looking for resources in %s", _tmp6_);
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_g_free0 (_tmp7_);
+	_g_free0 (_tmp6_);
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp8_ = authenicators;
+	_tmp7_ = 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));
+	_tmp8_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp10_ = _tmp9_;
+	_tmp9_ = _tmp8_;
 #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;
+	g_debug ("shotwell-publishing.vala:23: Found %d authenicators", _tmp9_);
 #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");
+	_tmp10_ = authenicators;
 #line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	if (_tmp12_) {
-#line 298 "shotwell-publishing.c"
-		SpitPluggable** _tmp13_;
-		gint _tmp13__length1;
-		GFile* _tmp14_;
-		FacebookService* _tmp15_;
+	if (gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection), "facebook")) {
+#line 391 "shotwell-publishing.c"
+		SpitPluggable** _tmp11_;
+		gint _tmp11__length1;
+		GFile* _tmp12_;
+		FacebookService* _tmp13_;
 #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp13_ = self->priv->pluggables;
+		_tmp11_ = self->priv->pluggables;
 #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp13__length1 = self->priv->pluggables_length1;
+		_tmp11__length1 = self->priv->pluggables_length1;
 #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp14_ = resource_directory;
+		_tmp12_ = resource_directory;
 #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp15_ = facebook_service_new (_tmp14_);
+		_tmp13_ = facebook_service_new (_tmp12_);
 #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"
+		_vala_array_add1 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+#line 406 "shotwell-publishing.c"
 	}
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp16_ = authenicators;
+	_tmp14_ = 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_;
-		gint _tmp18__length1;
-		GFile* _tmp19_;
-		PicasaService* _tmp20_;
+	if (gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection), "picasa")) {
+#line 412 "shotwell-publishing.c"
+		SpitPluggable** _tmp15_;
+		gint _tmp15__length1;
+		GFile* _tmp16_;
+		PicasaService* _tmp17_;
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp18_ = self->priv->pluggables;
+		_tmp15_ = self->priv->pluggables;
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp18__length1 = self->priv->pluggables_length1;
+		_tmp15__length1 = self->priv->pluggables_length1;
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp19_ = resource_directory;
+		_tmp16_ = resource_directory;
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp20_ = picasa_service_new (_tmp19_);
+		_tmp17_ = picasa_service_new (_tmp16_);
 #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"
+		_vala_array_add2 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+#line 427 "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");
+	_tmp18_ = authenicators;
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	if (_tmp22_) {
-#line 344 "shotwell-publishing.c"
-		SpitPluggable** _tmp23_;
-		gint _tmp23__length1;
-		GFile* _tmp24_;
-		FlickrService* _tmp25_;
+	if (gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection), "flickr")) {
+#line 433 "shotwell-publishing.c"
+		SpitPluggable** _tmp19_;
+		gint _tmp19__length1;
+		GFile* _tmp20_;
+		FlickrService* _tmp21_;
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp23_ = self->priv->pluggables;
+		_tmp19_ = self->priv->pluggables;
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp23__length1 = self->priv->pluggables_length1;
+		_tmp19__length1 = self->priv->pluggables_length1;
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp24_ = resource_directory;
+		_tmp20_ = resource_directory;
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp25_ = flickr_service_new (_tmp24_);
+		_tmp21_ = flickr_service_new (_tmp20_);
 #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"
+		_vala_array_add3 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+#line 448 "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");
+	_tmp22_ = authenicators;
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	if (_tmp27_) {
-#line 367 "shotwell-publishing.c"
-		SpitPluggable** _tmp28_;
-		gint _tmp28__length1;
-		GFile* _tmp29_;
-		YouTubeService* _tmp30_;
+	if (gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), "youtube")) {
+#line 454 "shotwell-publishing.c"
+		SpitPluggable** _tmp23_;
+		gint _tmp23__length1;
+		GFile* _tmp24_;
+		YouTubeService* _tmp25_;
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp28_ = self->priv->pluggables;
+		_tmp23_ = self->priv->pluggables;
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp28__length1 = self->priv->pluggables_length1;
+		_tmp23__length1 = self->priv->pluggables_length1;
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp29_ = resource_directory;
+		_tmp24_ = resource_directory;
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp30_ = you_tube_service_new (_tmp29_);
+		_tmp25_ = you_tube_service_new (_tmp24_);
 #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"
+		_vala_array_add4 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+#line 469 "shotwell-publishing.c"
 	}
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp31_ = self->priv->pluggables;
+	_tmp26_ = self->priv->pluggables;
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp31__length1 = self->priv->pluggables_length1;
+	_tmp26__length1 = self->priv->pluggables_length1;
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp32_ = resource_directory;
+	_tmp27_ = resource_directory;
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp33_ = piwigo_service_new (_tmp32_);
+	_tmp28_ = piwigo_service_new (_tmp27_);
 #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));
+	_vala_array_add5 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp29_ = self->priv->pluggables;
+#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp29__length1 = self->priv->pluggables_length1;
+#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp30_ = g_file_get_parent (module_file);
+#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp31_ = _tmp30_;
+#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp32_ = tumblr_service_new (_tmp31_);
+#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_vala_array_add6 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_g_object_unref0 (_tmp31_);
 #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"
@@ -398,99 +499,114 @@ ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GTy
 	_g_object_unref0 (resource_directory);
 #line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	return self;
-#line 402 "shotwell-publishing.c"
+#line 503 "shotwell-publishing.c"
 }
 
 
-ShotwellPublishingCoreServices* shotwell_publishing_core_services_new (GFile* module_file) {
+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 409 "shotwell-publishing.c"
+#line 512 "shotwell-publishing.c"
 }
 
 
-static const gchar* shotwell_publishing_core_services_real_get_module_name (SpitModule* base) {
+static const gchar*
+shotwell_publishing_core_services_real_get_module_name (SpitModule* base)
+{
 	ShotwellPublishingCoreServices * self;
 	const gchar* result = NULL;
-#line 54 "/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 55 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 59 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	result = _ ("Core Publishing Services");
-#line 55 "/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 422 "shotwell-publishing.c"
+#line 527 "shotwell-publishing.c"
 }
 
 
-static const gchar* shotwell_publishing_core_services_real_get_version (SpitModule* base) {
+static const gchar*
+shotwell_publishing_core_services_real_get_version (SpitModule* base)
+{
 	ShotwellPublishingCoreServices * self;
 	const gchar* result = NULL;
-#line 58 "/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 59 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 63 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	result = _VERSION;
-#line 59 "/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 435 "shotwell-publishing.c"
+#line 542 "shotwell-publishing.c"
 }
 
 
-static const gchar* shotwell_publishing_core_services_real_get_id (SpitModule* base) {
+static const gchar*
+shotwell_publishing_core_services_real_get_id (SpitModule* base)
+{
 	ShotwellPublishingCoreServices * self;
 	const gchar* result = NULL;
-#line 62 "/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 63 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	result = "org.yorba.shotwell.publishing.core_services";
-#line 63 "/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 448 "shotwell-publishing.c"
+#line 557 "shotwell-publishing.c"
 }
 
 
-static SpitPluggable** shotwell_publishing_core_services_real_get_pluggables (SpitModule* base, int* result_length1) {
+static SpitPluggable**
+shotwell_publishing_core_services_real_get_pluggables (SpitModule* base,
+                                                       int* result_length1)
+{
 	ShotwellPublishingCoreServices * self;
 	SpitPluggable** result = NULL;
 	SpitPluggable** _tmp0_;
 	gint _tmp0__length1;
 	SpitPluggable** _tmp1_;
 	gint _tmp1__length1;
-#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_PUBLISHING_CORE_SERVICES, ShotwellPublishingCoreServices);
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp0_ = self->priv->pluggables;
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp0__length1 = self->priv->pluggables_length1;
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp1_ = _tmp0_;
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp1__length1 = _tmp0__length1;
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if (result_length1) {
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*result_length1 = _tmp1__length1;
-#line 473 "shotwell-publishing.c"
+#line 585 "shotwell-publishing.c"
 	}
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	result = _tmp1_;
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	return result;
-#line 479 "shotwell-publishing.c"
+#line 591 "shotwell-publishing.c"
 }
 
 
-static void shotwell_publishing_core_services_class_init (ShotwellPublishingCoreServicesClass * klass) {
+static void
+shotwell_publishing_core_services_class_init (ShotwellPublishingCoreServicesClass * klass)
+{
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	shotwell_publishing_core_services_parent_class = g_type_class_peek_parent (klass);
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	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 490 "shotwell-publishing.c"
+#line 604 "shotwell-publishing.c"
 }
 
 
-static void shotwell_publishing_core_services_spit_module_interface_init (SpitModuleIface * iface) {
+static void
+shotwell_publishing_core_services_spit_module_interface_init (SpitModuleIface * iface)
+{
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	shotwell_publishing_core_services_spit_module_parent_iface = g_type_interface_peek_parent (iface);
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
@@ -501,11 +617,13 @@ 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 505 "shotwell-publishing.c"
+#line 621 "shotwell-publishing.c"
 }
 
 
-static void shotwell_publishing_core_services_instance_init (ShotwellPublishingCoreServices * self) {
+static void
+shotwell_publishing_core_services_instance_init (ShotwellPublishingCoreServices * self)
+{
 	SpitPluggable** _tmp0_;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	self->priv = SHOTWELL_PUBLISHING_CORE_SERVICES_GET_PRIVATE (self);
@@ -517,11 +635,13 @@ 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 521 "shotwell-publishing.c"
+#line 639 "shotwell-publishing.c"
 }
 
 
-static void shotwell_publishing_core_services_finalize (GObject * obj) {
+static void
+shotwell_publishing_core_services_finalize (GObject * obj)
+{
 	ShotwellPublishingCoreServices * self;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SHOTWELL_PUBLISHING_CORE_SERVICES, ShotwellPublishingCoreServices);
@@ -529,11 +649,13 @@ 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 533 "shotwell-publishing.c"
+#line 653 "shotwell-publishing.c"
 }
 
 
-GType shotwell_publishing_core_services_get_type (void) {
+GType
+shotwell_publishing_core_services_get_type (void)
+{
 	static volatile gsize shotwell_publishing_core_services_type_id__volatile = 0;
 	if (g_once_init_enter (&shotwell_publishing_core_services_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (ShotwellPublishingCoreServicesClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) shotwell_publishing_core_services_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ShotwellPublishingCoreServices), 0, (GInstanceInitFunc) shotwell_publishing_core_services_instance_init, NULL };
@@ -547,65 +669,56 @@ GType shotwell_publishing_core_services_get_type (void) {
 }
 
 
-SpitModule* spit_entry_point (SpitEntryPointParams* params) {
+SpitModule*
+spit_entry_point (SpitEntryPointParams* params)
+{
 	SpitModule* result = NULL;
-	SpitEntryPointParams* _tmp0_;
+	gint _tmp0_;
 	gint _tmp1_;
-	SpitEntryPointParams* _tmp2_;
+	ShotwellPublishingCoreServices* _tmp2_ = NULL;
 	gint _tmp3_;
-	gint _tmp4_;
-	ShotwellPublishingCoreServices* _tmp5_ = NULL;
-	SpitEntryPointParams* _tmp6_;
-	gint _tmp7_;
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp0_ = params;
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp1_ = (*_tmp0_).host_min_spit_interface;
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp2_ = params;
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp3_ = (*_tmp2_).host_max_spit_interface;
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp4_ = spit_negotiate_interfaces (_tmp1_, _tmp3_, SPIT_CURRENT_INTERFACE);
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	(*params).module_spit_interface = _tmp4_;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp6_ = params;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp7_ = (*_tmp6_).module_spit_interface;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	if (_tmp7_ != SPIT_UNSUPPORTED_INTERFACE) {
-#line 579 "shotwell-publishing.c"
-		SpitEntryPointParams* _tmp8_;
-		GFile* _tmp9_;
-		ShotwellPublishingCoreServices* _tmp10_;
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp8_ = params;
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp9_ = (*_tmp8_).module_file;
 #line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp10_ = shotwell_publishing_core_services_new (_tmp9_);
+	_tmp0_ = (*params).host_min_spit_interface;
 #line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_g_object_unref0 (_tmp5_);
+	_tmp1_ = (*params).host_max_spit_interface;
 #line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp5_ = _tmp10_;
-#line 593 "shotwell-publishing.c"
+	(*params).module_spit_interface = spit_negotiate_interfaces (_tmp0_, _tmp1_, SPIT_CURRENT_INTERFACE);
+#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp3_ = (*params).module_spit_interface;
+#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	if (_tmp3_ != SPIT_UNSUPPORTED_INTERFACE) {
+#line 691 "shotwell-publishing.c"
+		GFile* _tmp4_;
+		ShotwellPublishingCoreServices* _tmp5_;
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_tmp4_ = (*params).module_file;
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_tmp5_ = shotwell_publishing_core_services_new (_tmp4_);
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_g_object_unref0 (_tmp2_);
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_tmp2_ = _tmp5_;
+#line 702 "shotwell-publishing.c"
 	} else {
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_g_object_unref0 (_tmp5_);
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp5_ = NULL;
-#line 599 "shotwell-publishing.c"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_g_object_unref0 (_tmp2_);
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_tmp2_ = NULL;
+#line 708 "shotwell-publishing.c"
 	}
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_TYPE_MODULE, SpitModule);
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TYPE_MODULE, SpitModule);
+#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	return result;
-#line 605 "shotwell-publishing.c"
+#line 714 "shotwell-publishing.c"
 }
 
 
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_destroy (gpointer array,
+                     gint array_length,
+                     GDestroyNotify destroy_func)
+{
 	if ((array != NULL) && (destroy_func != NULL)) {
 		int i;
 		for (i = 0; i < array_length; i = i + 1) {
@@ -617,7 +730,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti
 }
 
 
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_free (gpointer array,
+                  gint array_length,
+                  GDestroyNotify destroy_func)
+{
 	_vala_array_destroy (array, array_length, destroy_func);
 	g_free (array);
 }
diff --git a/plugins/shotwell-publishing/shotwell-publishing.vala b/plugins/shotwell-publishing/shotwell-publishing.vala
index dce5954..3515f5f 100644
--- a/plugins/shotwell-publishing/shotwell-publishing.vala
+++ b/plugins/shotwell-publishing/shotwell-publishing.vala
@@ -49,6 +49,10 @@ private class ShotwellPublishingCoreServices : Object, Spit.Module {
 #if HAVE_PIWIGO
         pluggables += new PiwigoService(resource_directory);
 #endif
+
+#if HAVE_TUMBLR
+        pluggables += new TumblrService(module_file.get_parent());
+#endif
     }
     
     public unowned string get_module_name() {
diff --git a/plugins/shotwell-publishing/tumblr.png b/plugins/shotwell-publishing/tumblr.png
new file mode 100644
index 0000000..d5bf02b
--- /dev/null
+++ b/plugins/shotwell-publishing/tumblr.png
diff --git a/plugins/shotwell-publishing/tumblr_publishing_options_pane.ui b/plugins/shotwell-publishing/tumblr_publishing_options_pane.ui
new file mode 100644
index 0000000..acc5459
--- /dev/null
+++ b/plugins/shotwell-publishing/tumblr_publishing_options_pane.ui
@@ -0,0 +1,152 @@
+<?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="tumblr_pane">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="spacing">16</property>
+    <property name="homogeneous">True</property>
+    <child>
+      <object class="GtkBox" id="inner_wrapper">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">40</property>
+        <child>
+          <object class="GtkLabel" id="upload_info_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label">You are logged into Tumblr as (name).
+
+(this label's string is populated and set inside the code,
+so changes made here will not display)</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="padding">16</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkGrid" id="visibility_and_size_grid">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">center</property>
+            <property name="valign">center</property>
+            <property name="row_spacing">8</property>
+            <property name="column_spacing">24</property>
+            <child>
+              <object class="GtkLabel" id="blog_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Blogs:</property>
+                <property name="use_underline">True</property>
+                <property name="justify">right</property>
+                <property name="mnemonic_widget">blog_combo</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="size_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">end</property>
+                <property name="label" translatable="yes">Photo _size:</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">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkComboBoxText" id="blog_combo">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkComboBoxText" id="size_combo">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="padding">18</property>
+            <property name="position">1</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="spacing">48</property>
+            <property name="homogeneous">True</property>
+            <child>
+              <object class="GtkButton" id="logout_button">
+                <property name="label" translatable="yes">_Logout</property>
+                <property name="width_request">96</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="padding">24</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="publish_button">
+                <property name="label" translatable="yes">_Publish</property>
+                <property name="width_request">96</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="padding">24</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="padding">1</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="padding">8</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+  </object>
+</interface>